-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Menu Items overview - Filter on Component - v2 #28832
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.
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
Merged
obuisard
merged 45 commits into
joomla:4.3-dev
from
pe7er:menu-items-overview-filter-on-component
Jan 12, 2023
Merged
Changes from all commits
Commits
Show all changes
45 commits
Select commit
Hold shift + click to select a range
a8df0ac
Menu Items overview - Filter on Component - v2
pe7er aaf4ce3
Update administrator/components/com_menus/forms/filter_items.xml
pe7er 608bc75
prepared statement
alikon d951e96
Merge pull request #1 from alikon/patch-109
pe7er d2745b6
Merge branch '4.0-dev' of github.com:pe7er/joomla-cms into menu-items…
pe7er 1bd1c75
Menu Items overview - Filter on Component - v3
pe7er d62ff87
Menu Items overview - Filter on Component - v4
pe7er d01d134
Menu Items overview - Filter on Component - fix
pe7er 9c7e460
Update administrator/components/com_menus/src/Model/ItemsModel.php
pe7er 63a8feb
Update administrator/components/com_menus/src/Model/ItemsModel.php
pe7er 5c65f1f
removed unnecessary if statement
pe7er 5c79bab
fixed the removal of language file loading
pe7er fb902a4
fixed missing semicolon
pe7er 585c185
Added currentMenuType context to the component filter
pe7er 2f81c14
Update administrator/components/com_menus/src/Field/MenuItemByCompone…
pe7er 459030d
Update administrator/components/com_menus/src/Field/MenuItemByCompone…
pe7er ff934de
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into m…
pe7er 6e60bd9
Merge remote-tracking branch 'origin/menu-items-overview-filter-on-co…
pe7er db564c5
Update administrator/components/com_menus/src/Field/MenuItemByCompone…
pe7er d7c0400
Update administrator/components/com_menus/src/Field/MenuItemByCompone…
pe7er ce3433d
Update administrator/components/com_menus/src/Field/MenuItemByCompone…
pe7er 00b60d9
Update administrator/components/com_menus/src/Field/MenuItemByCompone…
pe7er f3baefd
fix update requested
alikon 167b6dd
Merge pull request #2 from alikon/patch-2
pe7er 8773bc9
Merge branch 'joomla:4.1-dev' into menu-items-overview-filter-on-comp…
pe7er 438e91d
Merge branch '4.1-dev' into menu-items-overview-filter-on-component
richard67 f5f0e27
Merge branch '4.2-dev' into menu-items-overview-filter-on-component
richard67 11bca7e
Fix copyright year
richard67 3fd1c46
Merge branch '4.2-dev' into menu-items-overview-filter-on-component
roland-d 40e3f99
Merge branch '4.2-dev' into menu-items-overview-filter-on-component
roland-d 1a1dd62
Merge branch '4.2-dev' of github.com:pe7er/joomla-cms into menu-items…
pe7er 2e1e1a9
[4.2] Menu Items overview - fix for uninstalled components #28832
pe7er ba915c0
Merge tag 'psr12anchor' into psr12/merge/28832
joomla-bot 9cf5e0d
Phase 1 convert BRANCH to PSR-12
joomla-bot 6a04c60
Phase 2 convert BRANCH to PSR-12
joomla-bot 5c04b1d
Merge tag 'psr12final' into psr12/merge/28832
joomla-bot 4412f3c
Merge branch '4.3-dev' into menu-items-overview-filter-on-component
obuisard 68d25dd
Merge branch '4.3-dev' into menu-items-overview-filter-on-component
obuisard 5436b5f
Update administrator/components/com_menus/src/Field/MenuItemByCompone…
obuisard cdb8e91
Update administrator/components/com_menus/src/Field/MenuItemByCompone…
obuisard 85f9e23
Update administrator/components/com_menus/src/Field/MenuItemByCompone…
obuisard 3f85c9e
Update administrator/components/com_menus/src/Field/MenuItemByCompone…
obuisard c58da43
Merge branch '4.3-dev' into menu-items-overview-filter-on-component
obuisard 6e15f37
Merge branch '4.3-dev' into menu-items-overview-filter-on-component
rdeutz c01389d
Merge branch '4.3-dev' into menu-items-overview-filter-on-component
obuisard File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
administrator/components/com_menus/src/Field/MenuItemByComponentField.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @package Joomla.Administrator | ||
| * @subpackage com_menus | ||
| * | ||
| * @copyright (C) 2022 Open Source Matters, Inc. <https://www.joomla.org> | ||
| * @license GNU General Public License version 2 or later; see LICENSE.txt | ||
| */ | ||
|
|
||
| namespace Joomla\Component\Menus\Administrator\Field; | ||
|
|
||
| use Joomla\CMS\Factory; | ||
| use Joomla\CMS\Form\Field\ListField; | ||
| use Joomla\CMS\Language\Text; | ||
| use Joomla\Utilities\ArrayHelper; | ||
|
|
||
| /** | ||
| * MenuItem by Component field. | ||
| * | ||
| * @since __DEPLOY_VERSION__ | ||
| */ | ||
| class MenuItemByComponentField extends ListField | ||
| { | ||
| /** | ||
| * The form field type. | ||
| * | ||
| * @var string | ||
| * @since __DEPLOY_VERSION__ | ||
| */ | ||
| protected $type = 'MenuItemByComponent'; | ||
|
|
||
| /** | ||
| * Method to get a list of options for a list input. | ||
| * | ||
| * @return array An array of JHtml options. | ||
| * | ||
| * @since __DEPLOY_VERSION__ | ||
| */ | ||
| protected function getOptions() | ||
| { | ||
| // Initialise variable. | ||
| $db = $this->getDatabase(); | ||
| $options = []; | ||
|
|
||
| $query = $db->getQuery(true); | ||
| $query->select('DISTINCT ' . $db->quoteName('extensions.element')) | ||
| ->from($db->quoteName('#__menu', 'menu')) | ||
| ->join( | ||
| 'INNER', | ||
| $db->quoteName('#__extensions', 'extensions'), | ||
| $db->quoteName('extensions.extension_id') . ' = ' . $db->quoteName('menu.component_id') | ||
| ) | ||
| ->where($db->quoteName('menu.client_id') . ' = 0') | ||
| ->where($db->quoteName('menu.type') . ' = ' . $db->quote('component')) | ||
| ->where($db->quoteName('extensions.extension_id') . ' IS NOT NULL'); | ||
|
|
||
| $app = Factory::getApplication(); | ||
| $currentMenuType = $app->getInput()->getString('menutype', $app->getUserState($this->context . '.menutype', '')); | ||
|
|
||
| if ($currentMenuType) { | ||
| $query->where($db->quoteName('menu.menutype') . ' = :currentMenuType') | ||
| ->bind(':currentMenuType', $currentMenuType); | ||
| } | ||
|
|
||
| $db->setQuery($query); | ||
| $components = $db->loadColumn(); | ||
|
|
||
| foreach ($components as $component) { | ||
| // Load component language files | ||
| $lang = $app->getLanguage(); | ||
| $lang->load($component, JPATH_BASE) | ||
| || $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component); | ||
|
|
||
| $option = new \stdClass(); | ||
| $option->value = $component; | ||
| $option->text = Text::_(strtoupper($component)); | ||
| $options[] = $option; | ||
| } | ||
|
|
||
| // Sort by name | ||
| $options = ArrayHelper::sortObjects($options, 'text', 1, true, true); | ||
|
|
||
| // Merge any additional options in the XML definition. | ||
| $options = array_merge(parent::getOptions(), $options); | ||
|
|
||
| return $options; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.