Skip to content

[4.0] Menu Items overview - Filter on Component #24665

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
wants to merge 12 commits into from
Closed

[4.0] Menu Items overview - Filter on Component #24665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ac6b7ec
[4.0] Menu Items overview - Filter on Component
pe7er Apr 21, 2019
43bb5c1
Update administrator/components/com_menus/forms/filter_items.xml
Apr 21, 2019
f57ee0e
Merge branch '4.0-dev' into menu-overview-component-filter
infograf768 Apr 22, 2019
b2b546b
Update administrator/components/com_menus/Model/ItemsModel.php
alikon Apr 23, 2019
9b0cb59
Added language label for COM_MENUS_FILTER_COMPONENT_LABEL
pe7er Apr 23, 2019
72f4676
fixed merge conflict in ItemsModel.php
pe7er Apr 23, 2019
7c6176b
Merge branch 'menu-overview-component-filter' of github.com:pe7er/joo…
pe7er Apr 23, 2019
6bad408
Merge branch '4.0-dev' into menu-overview-component-filter
infograf768 Apr 24, 2019
4bab7de
Merge branch '4.0-dev' into menu-overview-component-filter
infograf768 May 5, 2019
31e5ff3
Merge branch '4.0-dev' into menu-overview-component-filter
infograf768 May 18, 2019
9ffb2f7
Merge branch '4.0-dev' into menu-overview-component-filter
roland-d May 18, 2019
bb364f8
Merge branch '4.0-dev' into menu-overview-component-filter
roland-d May 18, 2019
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
9 changes: 8 additions & 1 deletion administrator/components/com_menus/Model/ItemsModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
'parent_id', 'a.parent_id',
'publish_up', 'a.publish_up',
'publish_down', 'a.publish_down',
'a.ordering'
'a.ordering',
'e.name', 'componentName'
);

$assoc = Associations::isEnabled();
Expand Down Expand Up @@ -499,6 +500,12 @@ protected function getListQuery()
$query->where('a.language = ' . $db->quote($language));
}

// Filter on componentName
if ($componentName = $this->getState('filter.componentName'))
{
$query->where($db->quoteName('e.name') . ' = ' . $db->quote($componentName));
}

// Add the list ordering clause.
$query->order($db->escape($this->getState('list.ordering', 'a.lft')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));

Expand Down
8 changes: 8 additions & 0 deletions administrator/components/com_menus/forms/filter_items.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@
>
<option value="">COM_MENUS_FILTER_SELECT_PARENT_MENU_ITEM</option>
</field>
<field
name="componentName"
type="componentscategory"
label="COM_MENUS_FILTER_COMPONENT_LABEL"
onchange="this.form.submit();"
>
<option value="">COM_MENUS_OPTION_SELECT_COMPONENT</option>
</field>
</fields>
<fields name="list">
<field
Expand Down
1 change: 1 addition & 0 deletions administrator/language/en-GB/en-GB.com_menus.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ COM_MENUS_FIELD_VALUE_NEW_WITH_NAV="New Window With Navigation"
COM_MENUS_FIELD_VALUE_NEW_WITHOUT_NAV="New Without Navigation"
COM_MENUS_FIELD_VALUE_PARENT="Parent"
COM_MENUS_FIELDSET_RULES="Permissions"
COM_MENUS_FILTER_COMPONENT_LABEL="Component"
COM_MENUS_FILTER_PARENT_MENU_ITEM_LABEL="Parent Menu Item"
COM_MENUS_FILTER_SELECT_PARENT_MENU_ITEM="- Select Parent Menu Item -"
COM_MENUS_GRID_UNSET_LANGUAGE="Unset %s Default"
Expand Down