diff --git a/code/cms/DMSDocumentAddController.php b/code/cms/DMSDocumentAddController.php index d8531e0..ec577dc 100644 --- a/code/cms/DMSDocumentAddController.php +++ b/code/cms/DMSDocumentAddController.php @@ -203,7 +203,9 @@ class DMSDocumentAddController extends LeftAndMain { $list = ''; diff --git a/javascript/DMSDocumentAddExistingField.js b/javascript/DMSDocumentAddExistingField.js index 7c5f302..a560e16 100644 --- a/javascript/DMSDocumentAddExistingField.js +++ b/javascript/DMSDocumentAddExistingField.js @@ -2,6 +2,32 @@ "use strict"; $.entwine('ss', function($) { + $('.document-add-existing').entwine({ + adddocument: function(document_id) { + var page_id = $(this).closest('form').find(':input[name=ID]').val(); + + jQuery.ajax( + 'admin/pages/adddocument/linkdocument?ID=' + page_id + '&documentID=' + document_id, + { + dataType: 'json', + success: function(data, textstatus) { + var fn = window.tmpl.cache['ss-uploadfield-addtemplate']; + var fnout = fn({ + files: [data], + formatFileSize: function (bytes) { + if (typeof bytes !== 'number') return ''; + if (bytes >= 1000000000) return (bytes / 1000000000).toFixed(2) + ' GB'; + if (bytes >= 1000000) return (bytes / 1000000).toFixed(2) + ' MB'; + return (bytes / 1000).toFixed(2) + ' KB'; + } + }); + + $('.ss-add-files').append(fnout); + } + } + ); + } + }); $('.document-add-existing .document-autocomplete').entwine({ onmatch: function() { @@ -10,30 +36,9 @@ source: 'admin/pages/adddocument/documentautocomplete', select: function(event, ui) { if(ui.item) { - var page_id = $(this).closest('form').find(':input[name=ID]').val(); var document_id = ui.item.value; - jQuery.ajax( - 'admin/pages/adddocument/linkdocument?ID=' + page_id + '&documentID=' + document_id, - { - dataType: 'json', - success: function(data, textstatus) { - var fn = window.tmpl.cache['ss-uploadfield-addtemplate']; - var fnout = fn({ - files: [data], - formatFileSize: function (bytes) { - if (typeof bytes !== 'number') return ''; - if (bytes >= 1000000000) return (bytes / 1000000000).toFixed(2) + ' GB'; - if (bytes >= 1000000) return (bytes / 1000000).toFixed(2) + ' MB'; - return (bytes / 1000).toFixed(2) + ' KB'; - }, - options: self.fileupload('option') - }); - - $('.ss-add-files').append(fnout); - } - } - ); + $(this).closest('.document-add-existing').adddocument(document_id); } } }); @@ -46,5 +51,15 @@ } }); + $('.document-add-existing a.add-document').entwine({ + onclick: function(event) { + var document_id = $(this).data('document-id'); + + $(this).closest('.document-add-existing').adddocument(document_id); + + return false; + } + }) + }); }(jQuery)); \ No newline at end of file