[com_associations] Creating missing filters

joomla · Mar 15, 2017 · ef77a55 · ef77a55
1 parent 08c4ec0
commit ef77a55
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/administrator/components/com_associations/models/associations.php b/administrator/components/com_associations/models/associations.php
@@ -369,8 +369,7 @@ protected function getListQuery()
 		// Filter on the level.
 		if ($level = $this->getState('filter.level'))
 		{
-			$tableAlias = in_array($extensionName, array('com_menus', 'com_categories')) ? 'a' : 'c';
-			$query->where($db->qn($tableAlias . '.level') . ' <= ' . ((int) $level + (int) $baselevel - 1));
+			$query->where($db->qn( 'a.level') . ' <= ' . ((int) $level + (int) $baselevel - 1));
 		}
 
 		// Filter by menu type.

diff --git a/administrator/components/com_associations/views/associations/view.html.php b/administrator/components/com_associations/views/associations/view.html.php
@@ -128,7 +128,7 @@ public function display($tpl = null)
 					unset($this->activeFilters['state']);
 					$this->filterForm->removeField('state', 'filter');
 				}
-				if ($type !== 'category')
+				if (empty($support['category']))
 				{
 					unset($this->activeFilters['category_id']);
 					$this->filterForm->removeField('category_id', 'filter');
@@ -138,7 +138,7 @@ public function display($tpl = null)
 					unset($this->activeFilters['menutype']);
 					$this->filterForm->removeField('menutype', 'filter');
 				}
-				if (!in_array($extensionName, array('com_categories', 'com_menus')))
+				if (empty($support['level']))
 				{
 					unset($this->activeFilters['level']);
 					$this->filterForm->removeField('level', 'filter');
@@ -213,7 +213,7 @@ protected function addToolbar()
 		{
 			JToolbarHelper::title(JText::_('COM_ASSOCIATIONS_TITLE_LIST_SELECT'), 'contract');
 		}
-	
+
 		if ($user->authorise('core.admin', 'com_associations') || $user->authorise('core.options', 'com_associations'))
 		{
 			if (!isset($this->typeName))

diff --git a/administrator/components/com_contact/helpers/associations.php b/administrator/components/com_contact/helpers/associations.php
@@ -152,6 +152,7 @@ public function getType($typeName = '')
 					$support['state'] = true;
 					$support['acl'] = true;
 					$support['checkout'] = true;
+					$support['category'] = true;
 
 					$tables = array(
 						'a' => '#__contact_details'
@@ -170,6 +171,7 @@ public function getType($typeName = '')
 					$support['state'] = true;
 					$support['acl'] = true;
 					$support['checkout'] = true;
+					$support['level'] = true;
 
 					$tables = array(
 						'a' => '#__categories'

diff --git a/administrator/components/com_content/helpers/associations.php b/administrator/components/com_content/helpers/associations.php
@@ -150,6 +150,7 @@ public function getType($typeName = '')
 					$support['state'] = true;
 					$support['acl'] = true;
 					$support['checkout'] = true;
+					$support['category'] = true;
 
 					$tables = array(
 						'a' => '#__content'
@@ -168,6 +169,7 @@ public function getType($typeName = '')
 					$support['state'] = true;
 					$support['acl'] = true;
 					$support['checkout'] = true;
+					$support['level'] = true;
 
 					$tables = array(
 						'a' => '#__categories'

diff --git a/administrator/components/com_menus/helpers/associations.php b/administrator/components/com_menus/helpers/associations.php
@@ -145,6 +145,7 @@ public function getType($typeName = '')
 					$support['state'] = true;
 					$support['acl'] = true;
 					$support['checkout'] = true;
+					$support['level'] = true;
 
 					$tables = array(
 						'a' => '#__menu'

diff --git a/administrator/components/com_newsfeeds/helpers/associations.php b/administrator/components/com_newsfeeds/helpers/associations.php
@@ -154,6 +154,7 @@ public function getType($typeName = '')
 					$support['state'] = true;
 					$support['acl'] = true;
 					$support['checkout'] = true;
+					$support['category'] = true;
 
 					$tables = array(
 						'a' => '#__newsfeeds'
@@ -171,6 +172,7 @@ public function getType($typeName = '')
 					$support['state'] = true;
 					$support['acl'] = true;
 					$support['checkout'] = true;
+					$support['level'] = true;
 
 					$tables = array(
 						'a' => '#__categories'