Skip to content

Allow category selection in category search tool #19822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jo-sf wants to merge 4 commits into from
Closed

Allow category selection in category search tool #19822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
160e885
Category selection in category search tool
jo-sf Mar 3, 2018
5883c7d
Category selection in category search tool
jo-sf Mar 3, 2018
ce23239
Category selection in category search tool
jo-sf Mar 3, 2018
8ee08b4
Spaced added before "="
jo-sf Mar 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion administrator/components/com_categories/models/categories.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public function __construct($config = array())
'rgt', 'a.rgt',
'level', 'a.level',
'path', 'a.path',
'category_id',
'tag',
);
}
Expand Down Expand Up @@ -93,6 +94,7 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')

$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.search', 'filter_search', '', 'string'));
$this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
$this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '', 'string'));
$this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'cmd'));
$this->setState('filter.language', $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'string'));
$this->setState('filter.tag', $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '', 'string'));
Expand Down Expand Up @@ -127,6 +129,7 @@ protected function getStoreId($id = '')
$id .= ':' . $this->getState('filter.extension');
$id .= ':' . $this->getState('filter.search');
$id .= ':' . $this->getState('filter.published');
$id .= ':' . $this->getState('filter.category_id');
$id .= ':' . $this->getState('filter.access');
$id .= ':' . $this->getState('filter.language');
$id .= ':' . $this->getState('filter.level');
Expand Down Expand Up @@ -194,10 +197,29 @@ protected function getListQuery()
$query->where('a.extension = ' . $db->quote($extension));
}

// Filter by a single or group of categories.
$baselevel = 1;
$categoryId = $this->getState('filter.category_id');

if (is_numeric($categoryId))
{
$categoryTable = JTable::getInstance('Category', 'JTable');
$categoryTable->load($categoryId);
$rgt = $categoryTable->rgt;
$lft = $categoryTable->lft;
$baselevel = (int) $categoryTable->level;
$query->where('a.lft >= ' . (int) $lft)
->where('a.rgt <= ' . (int) $rgt);
}
elseif (is_array($categoryId))
{
$query->where('a.id IN (' . implode(',', ArrayHelper::toInteger($categoryId)) . ')');
}

// Filter on the level.
if ($level = $this->getState('filter.level'))
{
$query->where('a.level <= ' . (int) $level);
$query->where('a.level <= ' . ((int) $level + (int) $baselevel - 1));
}

// Filter by access level.
Expand Down
12 changes: 12 additions & 0 deletions administrator/components/com_categories/models/forms/filter_categories.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,18 @@
<option value="">JOPTION_SELECT_PUBLISHED</option>
</field>

<field
name="category_id"
type="category"
label="JOPTION_FILTER_CATEGORY"
description="JOPTION_FILTER_CATEGORY_DESC"
extension="com_content"
onchange="this.form.submit();"
published="0,1,2"
>
<option value="">JOPTION_SELECT_CATEGORY</option>
</field>

<field
name="access"
type="accesslevel"
Expand Down
8 changes: 4 additions & 4 deletions administrator/components/com_categories/views/categories/view.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,15 @@ protected function addToolbar()
JToolbarHelper::archiveList('categories.archive');
}

if (JFactory::getUser()->authorise('core.admin'))
if ($user->authorise('core.admin'))
{
JToolbarHelper::checkin('categories.checkin');
}

// Add a batch button
if ($canDo->get('core.create')
&& $canDo->get('core.edit')
&& $canDo->get('core.edit.state'))
if ($user->authorise('core.create', $component)
&& $user->authorise('core.edit', $component)
&& $user->authorise('core.edit.state', $component))
{
$title = JText::_('JTOOLBAR_BATCH');

Expand Down