Peter M. Groen / knowledgetree

Commit 39e48fca7cd41f5cafbb00ac99d4ac6603b067a7

Authored by Paul Barrett
1 parent d4930f48

Fix ordering of folder actions when Nulti-select plugin enabled 

Story ID:1321064. KTS-4403: With the 'Multi-select' plugin enabled the 'Folder actions' are out of order.

Fixed

Committed by: Paul Barrett
Inline Side-by-side
Showing 3 changed files with 3 additions and 2 deletions
plugins/multiselect/BulkImport.php
  View file @39e48fc
@@ -71,7 +71,7 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction { @@ -71,7 +71,7 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction {
71 if (method_exists($oPage, 'requireJSResources')) { 71 if (method_exists($oPage, 'requireJSResources')) {
72 $oPage->requireJSResources($aJavascript); 72 $oPage->requireJSResources($aJavascript);
73 } 73 }
74 - return $js._kt('Import from Server Location'); 74 + return _kt('Import from Server Location') . $js;
75 } 75 }
76 else 76 else
77 { 77 {
plugins/multiselect/BulkUpload.php
  View file @39e48fc
@@ -75,7 +75,7 @@ class InetBulkUploadFolderAction extends KTFolderAction { @@ -75,7 +75,7 @@ class InetBulkUploadFolderAction extends KTFolderAction {
75 } 75 }
76 76
77 $js = "<script src='resources/js/kt_hidelink.js' type='text/javascript'></script>"; 77 $js = "<script src='resources/js/kt_hidelink.js' type='text/javascript'></script>";
78 - return $js._kt('Bulk Upload'); 78 + return _kt('Bulk Upload') .$js;
79 } 79 }
80 else 80 else
81 { 81 {
plugins/multiselect/MultiSelectPlugin.php
  View file @39e48fc
@@ -126,6 +126,7 @@ class MultiSelectPlugin extends KTPlugin { @@ -126,6 +126,7 @@ class MultiSelectPlugin extends KTPlugin {
126 'InetdocumentFieldsv2.php', null); 126 'InetdocumentFieldsv2.php', null);
127 } 127 }
128 } 128 }
  129 +
129 $oPluginRegistry =& KTPluginRegistry::getSingleton(); 130 $oPluginRegistry =& KTPluginRegistry::getSingleton();
130 $oPluginRegistry->registerPlugin('MultiSelectPlugin', 'inet.multiselect.lookupvalue.plugin', __FILE__); 131 $oPluginRegistry->registerPlugin('MultiSelectPlugin', 'inet.multiselect.lookupvalue.plugin', __FILE__);
131 ?> 132 ?>
132 \ No newline at end of file 133 \ No newline at end of file