Include filtering on multiple categories, authors, and access levels

joomla · Mar 4, 2015 · 9a78a59 · 9a78a59
1 parent 581508d
commit 9a78a59
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 12 deletions.
diff --git a/administrator/components/com_content/models/articles.php b/administrator/components/com_content/models/articles.php
@@ -138,10 +138,10 @@ protected function getStoreId($id = '')
 	{
 		// Compile the store id.
 		$id .= ':' . $this->getState('filter.search');
-		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . serialize($this->getState('filter.access'));
 		$id .= ':' . $this->getState('filter.published');
-		$id .= ':' . $this->getState('filter.category_id');
-		$id .= ':' . $this->getState('filter.author_id');
+		$id .= ':' . serialize($this->getState('filter.category_id'));
+		$id .= ':' . serialize($this->getState('filter.author_id'));
 		$id .= ':' . $this->getState('filter.language');
 		$id .= ':' . serialize($this->getState('filter.tag'));
 
@@ -204,10 +204,17 @@ protected function getListQuery()
 		}
 
 		// Filter by access level.
-		if ($access = $this->getState('filter.access'))
+		$access = $this->getState('filter.access');
+		if (is_numeric($access))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
+		else if(is_array($access))
+		{
+			JArrayHelper::toInteger($access);
+			$access = implode(',', $access);
+			$query->where('a.access IN (' . $access . ')');
+		}
 
 		// Implement View Level Access
 		if (!$user->authorise('core.admin'))
@@ -264,6 +271,13 @@ protected function getListQuery()
 			$query->where('a.created_by ' . $type . (int) $authorId);
 		}
 
+		elseif (is_array($authorId))
+		{
+			JArrayHelper::toInteger($categoryId);
+			$authorId = implode(',', $authorId);
+			$query->where('a.created_by IN (' . $authorId . ')');
+		}
+
 		// Filter by search in title.
 		$search = $this->getState('filter.search');
 

diff --git a/administrator/components/com_content/models/featured.php b/administrator/components/com_content/models/featured.php
@@ -110,10 +110,17 @@ protected function getListQuery($resolveFKs = true)
 			->join('LEFT', '#__users AS ua ON ua.id = a.created_by');
 
 		// Filter by access level.
-		if ($access = $this->getState('filter.access'))
+		$access = $this->getState('filter.access');
+		if (is_numeric($access))
 		{
 			$query->where('a.access = ' . (int) $access);
 		}
+		else if(is_array($access))
+		{
+			JArrayHelper::toInteger($access);
+			$access = implode(',', $access);
+			$query->where('a.access IN (' . $access . ')');
+		}
 
 		// Filter by published state
 		$published = $this->getState('filter.published');
@@ -162,6 +169,13 @@ protected function getListQuery($resolveFKs = true)
 			$query->where('a.created_by ' . $type . (int) $authorId);
 		}
 
+		elseif (is_array($authorId))
+		{
+			JArrayHelper::toInteger($categoryId);
+			$authorId = implode(',', $authorId);
+			$query->where('a.created_by IN (' . $authorId . ')');
+		}
+
 		// Filter by search in title.
 		$search = $this->getState('filter.search');
 

diff --git a/administrator/components/com_content/models/forms/filter_articles.xml b/administrator/components/com_content/models/forms/filter_articles.xml
@@ -19,12 +19,13 @@
 		<field
 			name="category_id"
 			type="category"
+			multiple="true"
+			class="multipleCategories"
 			label="JOPTION_FILTER_CATEGORY"
 			extension="com_content"
 			description="JOPTION_FILTER_CATEGORY_DESC"
 			onchange="this.form.submit();"
 			>
-			<option value="">JOPTION_SELECT_CATEGORY</option>
 		</field>
 		<field
 			name="level"
@@ -42,20 +43,22 @@
 		<field
 			name="access"
 			type="accesslevel"
+			multiple="true"
+			class="multipleAccessLevels"
 			label="JOPTION_FILTER_ACCESS"
 			description="JOPTION_FILTER_ACCESS_DESC"
 			onchange="this.form.submit();"
 			>
-			<option value="">JOPTION_SELECT_ACCESS</option>
 		</field>
 		<field
 			name="author_id"
 			type="author"
+			multiple="true"
+			class="multipleAuthors"
 			label="COM_CONTENT_FILTER_AUTHOR"
 			description="COM_CONTENT_FILTER_AUTHOR_DESC"
 			onchange="this.form.submit();"
 			>
-			<option value="">JOPTION_SELECT_AUTHOR</option>
 		</field>
 		<field
 			name="language"

diff --git a/administrator/components/com_content/models/forms/filter_featured.xml b/administrator/components/com_content/models/forms/filter_featured.xml
@@ -21,12 +21,13 @@
 		<field
 			name="category_id"
 			type="category"
+			multiple="true"
+			class="multipleCategories"
 			label="JOPTION_FILTER_CATEGORY"
 			extension="com_content"
 			description="JOPTION_FILTER_CATEGORY_DESC"
 			onchange="this.form.submit();"
 			>
-			<option value="">JOPTION_SELECT_CATEGORY</option>
 		</field>
 		<field
 			name="level"
@@ -44,20 +45,22 @@
 		<field
 			name="author_id"
 			type="author"
+			multiple="true"
+			class="multipleAuthors"
 			label="COM_CONTENT_FILTER_AUTHOR"
 			description="COM_CONTENT_FILTER_AUTHOR_DESC"
 			onchange="this.form.submit();"
 			>
-			<option value="">JOPTION_SELECT_AUTHOR</option>
 		</field>
 		<field
 			name="access"
 			type="accesslevel"
+			multiple="true"
+			class="multipleAccessLevels"
 			label="JOPTION_FILTER_ACCESS"
 			description="JOPTION_FILTER_ACCESS_DESC"
 			onchange="this.form.submit();"
 			>
-			<option value="">JOPTION_SELECT_ACCESS</option>
 		</field>
 		<field
 			name="language"

diff --git a/administrator/components/com_content/views/articles/tmpl/default.php b/administrator/components/com_content/views/articles/tmpl/default.php
@@ -13,6 +13,9 @@
 
 JHtml::_('bootstrap.tooltip');
 JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_ACCESS')));
+JHtml::_('formbehavior.chosen', '.multipleAuthors', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_AUTHOR')));
+JHtml::_('formbehavior.chosen', '.multipleCategories', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_CATEGORY')));
 JHtml::_('formbehavior.chosen', '.multipleTags', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_TAG')));
 JHtml::_('formbehavior.chosen', 'select');
 

diff --git a/administrator/components/com_content/views/featured/tmpl/default.php b/administrator/components/com_content/views/featured/tmpl/default.php
@@ -13,6 +13,9 @@
 
 JHtml::_('bootstrap.tooltip');
 JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_ACCESS')));
+JHtml::_('formbehavior.chosen', '.multipleAuthors', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_AUTHOR')));
+JHtml::_('formbehavior.chosen', '.multipleCategories', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_CATEGORY')));
 JHtml::_('formbehavior.chosen', '.multipleTags', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_TAG')));
 JHtml::_('formbehavior.chosen', 'select');
 

diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php
@@ -13,6 +13,7 @@
 
 JHtml::_('behavior.formvalidator');
 JHtml::_('behavior.combobox');
+JHtml::_('formbehavior.chosen', '.multipleCategories', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_CATEGORY')));
 JHtml::_('formbehavior.chosen', '.multipleTags', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_TAG')));
 JHtml::_('formbehavior.chosen', 'select');
 

diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
@@ -28,12 +28,12 @@
 					type="category"
 					extension="com_content"
 					multiple="true"
+					class="multipleCategories"
 					default=""
 					size="10"
 					label="JCATEGORY"
 					description="MOD_ARTICLES_NEWS_FIELD_CATEGORY_DESC"
 				>
-					<option value="">JOPTION_ALL_CATEGORIES</option>
 				</field>
 
 				<field