Merge branch 'staging' into com_finder_maps-improvements

joomla · May 8, 2016 · 734dde9 · 734dde9
2 parents 380d3ae + 6d714c5
commit 734dde9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/administrator/components/com_menus/models/items.php b/administrator/components/com_menus/models/items.php
@@ -194,7 +194,7 @@ protected function getListQuery()
 					),
 					array(
 						null, null, null, null, null, null, null, null, null,
-						null, 'apublished', null, null, null, null,
+						null, 'a.published', null, null, null, null,
 						null, null, null, null, null, null, null, null, null
 					)
 				)

diff --git a/administrator/components/com_menus/views/items/tmpl/default_batch_body.php b/administrator/components/com_menus/views/items/tmpl/default_batch_body.php
@@ -13,8 +13,9 @@
 	JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE'))
 );
 $published = $this->state->get('filter.published');
+$menuType = JFactory::getApplication()->getUserState('com_menus.items.menutype');
 ?>
-
+<?php if (strlen($menuType) && $menuType != '*') : ?>
 <div class="row-fluid">
 	<div class="control-group span6">
 		<div class="controls">
@@ -45,4 +46,9 @@
 			<?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
 		</div>
 	<?php endif; ?>
-</div>
+</div>
+<?php else : ?>
+<div class="row-fluid">
+	<p><?php echo JText::_('COM_MENUS_SELECT_MENU_FIRST') ?></p>
+</div>
+<?php endif; ?>
diff --git a/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php b/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php
@@ -8,12 +8,12 @@
  */
 defined('_JEXEC') or die;
 
-$menuType = (array) JFactory::getApplication()->getUserState('com_menus.items.menutype');
+$menuType = JFactory::getApplication()->getUserState('com_menus.items.menutype');
 ?>
 <button class="btn" type="button" onclick="document.getElementById('batch-menu-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
 	<?php echo JText::_('JCANCEL'); ?>
 </button>
-<?php if (!empty($menuType)) : ?>
+<?php if (strlen($menuType) && $menuType != '*') : ?>
 	<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('item.batch');">
 		<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
 	</button>