Final fix for modules

joomla · Jan 2, 2012 · 3479f9c · 3479f9c
1 parent d97df21
commit 3479f9c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/administrator/components/com_modules/helpers/html/modules.php b/administrator/components/com_modules/helpers/html/modules.php
@@ -129,8 +129,9 @@ public static function positions($clientId)
 			'</label>',
 			'<fieldset id="batch-choose-action" class="combo">',
 			'<select name="batch[position_id]" class="inputbox" id="batch-position-id">',
-			'<option value="">'.JText::_('COM_MODULES_BATCH_POSITION_NOCHANGE').'</option>',
-			'<option value="noposition">'.JText::_('COM_MODULES_BATCH_POSITION_NOPOSITION').'</option>',
+			'<option value="">' . JText::_('JSELECT') . '</option>',
+			'<option value="nochange">' . JText::_('COM_MODULES_BATCH_POSITION_NOCHANGE') . '</option>',
+			'<option value="noposition">' . JText::_('COM_MODULES_BATCH_POSITION_NOPOSITION') . '</option>',
 			JHtml::_('select.options',	self::positionList($clientId)),
 			'</select>',
 			JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'),

diff --git a/administrator/components/com_modules/models/module.php b/administrator/components/com_modules/models/module.php
@@ -186,6 +186,10 @@ protected function batchCopy($value, $pks, $contexts)
 				{
 					$position = '';
 				}
+				elseif ($value == 'nochange')
+				{
+					$position = $table->position;
+				}
 				else
 				{
 					$position = $value;
@@ -278,6 +282,10 @@ protected function batchMove($value, $pks, $contexts)
 				{
 					$position = '';
 				}
+				elseif ($value == 'nochange')
+				{
+					$position = $table->position;
+				}
 				else
 				{
 					$position = $value;

diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini
@@ -10,7 +10,7 @@ COM_MODULES_ASSIGNED_VARIES_EXCEPT="All except selected"
 COM_MODULES_ASSIGNED_VARIES_ONLY="Selected only"
 COM_MODULES_BASIC_FIELDSET_LABEL="Basic Options"
 COM_MODULES_BATCH_POSITION_LABEL="Set Position"
-COM_MODULES_BATCH_POSITION_NOCHANGE="- Keep original Position -"
+COM_MODULES_BATCH_POSITION_NOCHANGE="Keep original Position"
 COM_MODULES_BATCH_POSITION_NOPOSITION="No Module Position"
 COM_MODULES_BATCH_OPTIONS="Batch process the selected modules"
 COM_MODULES_BATCH_TIP="If choosing to copy a module, any other actions selected will be applied to the copied module. Otherwise, all actions are applied to the selected module."