force client in menu item parent

joomla · Jul 29, 2016 · 6032c93 · 6032c93
1 parent 9d7f941
commit 6032c93
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/administrator/components/com_menus/models/fields/menuparent.php b/administrator/components/com_menus/models/fields/menuparent.php
@@ -43,6 +43,7 @@ protected function getOptions()
 			->from('#__menu AS a')
 			->join('LEFT', $db->quoteName('#__menu') . ' AS b ON a.lft > b.lft AND a.rgt < b.rgt');
 
+		// Filter by menu type.
 		if ($menuType = $this->form->getValue('menutype'))
 		{
 			$query->where('a.menutype = ' . $db->quote($menuType));
@@ -52,6 +53,14 @@ protected function getOptions()
 			$query->where('a.menutype != ' . $db->quote(''));
 		}
 
+		// Filter by client id.
+		$clientId = $this->getAttribute('clientid', null);
+
+		if (!is_null($clientId))
+		{
+			$query->where($db->quoteName('a.client_id') . ' = ' . (int) $clientId);
+		}
+
 		// Prevent parenting to children of this item.
 		if ($id = $this->form->getValue('id'))
 		{

diff --git a/administrator/components/com_menus/models/forms/item.xml b/administrator/components/com_menus/models/forms/item.xml
@@ -95,6 +95,7 @@
 			description="COM_MENUS_ITEM_FIELD_PARENT_DESC"
 			default="1"
 			filter="int"
+			clientid="0"
 			size="1">
 			<option
 				value="1">COM_MENUS_ITEM_ROOT</option>