Skip to content

Commit

Permalink
[com_actionlogs] Sort events in alpha order (#22542)
Browse files Browse the repository at this point in the history
* Sort log extensions

* Case insensitive

* Workaround. Thanks @mbabker.
  • Loading branch information
SharkyKZ authored and Michael Babker committed Oct 9, 2018
1 parent 0589ab0 commit e0ac018
Showing 1 changed file with 13 additions and 17 deletions.
30 changes: 13 additions & 17 deletions administrator/components/com_actionlogs/models/fields/logtype.php
Expand Up @@ -9,6 +9,8 @@

defined('_JEXEC') or die;

use Joomla\CMS\Application\ApplicationHelper;

JFormHelper::loadFieldClass('checkboxes');
JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');

Expand Down Expand Up @@ -38,29 +40,23 @@ public function getOptions()
{
$db = JFactory::getDbo();
$query = $db->getQuery(true)
->select('a.extension')
->from($db->quoteName('#__action_logs_extensions', 'a'));

$db->setQuery($query);
->select($db->quoteName('extension'))
->from($db->quoteName('#__action_logs_extensions'));

$extensions = $db->loadObjectList();
$extensions = $db->setQuery($query)->loadColumn();

$options = array();
$defaults = array();
$options = array();
$tmp = array('checked' => true);

foreach ($extensions as $extension)
{
$tmp = array(
'checked' => true,
);

$defaults[] = $extension;

ActionlogsHelper::loadTranslationFiles($extension->extension);
$option = JHtml::_('select.option', $extension->extension, JText::_($extension->extension));
$options[] = (object) array_merge($tmp, (array) $option);
ActionlogsHelper::loadTranslationFiles($extension);
$option = JHtml::_('select.option', $extension, JText::_($extension));
$options[ApplicationHelper::stringURLSafe(JText::_($extension)) . '_' . $extension] = (object) array_merge($tmp, (array) $option);
}

return array_merge(parent::getOptions(), $options);
ksort($options);

return array_merge(parent::getOptions(), array_values($options));
}
}

0 comments on commit e0ac018

Please sign in to comment.