-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '5.1-dev' into fix-contacts-category-levels
- Loading branch information
Showing
201 changed files
with
2,705 additions
and
2,643 deletions.
There are no files selected for viewing
This file contains 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 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
78 changes: 78 additions & 0 deletions
78
administrator/components/com_actionlogs/src/Field/UserlogtypeField.php
This file contains 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,78 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @package Joomla.Administrator | ||
| * @subpackage com_actionlogs | ||
| * | ||
| * @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\Actionlogs\Administrator\Field; | ||
|
|
||
| use Joomla\CMS\Application\ApplicationHelper; | ||
| use Joomla\CMS\Component\ComponentHelper; | ||
| use Joomla\CMS\Factory; | ||
| use Joomla\CMS\Form\Field\ListField; | ||
| use Joomla\CMS\HTML\HTMLHelper; | ||
| use Joomla\CMS\Language\Text; | ||
| use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper; | ||
| use Joomla\Database\ParameterType; | ||
|
|
||
| /** | ||
| * Field to load a list of all users that have logged actions | ||
| * | ||
| * @since __DEPLOY_VERSION__ | ||
| */ | ||
| class UserlogtypeField extends ListField | ||
| { | ||
| /** | ||
| * The form field type. | ||
| * | ||
| * @var string | ||
| * @since __DEPLOY_VERSION__ | ||
| */ | ||
| protected $type = 'UserLogType'; | ||
|
|
||
| /** | ||
| * Method to get the field options. | ||
| * | ||
| * @return array The field option objects. | ||
| * | ||
| * @since __DEPLOY_VERSION__ | ||
| */ | ||
| public function getOptions() | ||
| { | ||
| $db = $this->getDatabase(); | ||
| $user = Factory::getApplication()->getIdentity(); | ||
| $query = $db->getQuery(true) | ||
| ->select($db->quoteName('extensions')) | ||
| ->from($db->quoteName('#__action_logs_users')) | ||
| ->where($db->quoteName('user_id') . ' = :userid') | ||
| ->bind(':userid', $user->id, ParameterType::INTEGER); | ||
|
|
||
| $extensions = $db->setQuery($query)->loadColumn(); | ||
| $userExt = []; | ||
| $params = ComponentHelper::getParams('com_actionlogs'); | ||
| $globalExt = $params->get('loggable_extensions', []); | ||
|
|
||
| if (!empty($extensions)) { | ||
| $userExt = substr($extensions[0], 2); | ||
| $userExt = substr($userExt, 0, -2); | ||
| $userExt = explode('","', $userExt); | ||
| } | ||
|
|
||
| $common = array_merge($globalExt, array_intersect($globalExt, $userExt)); | ||
| $options = []; | ||
|
|
||
| foreach ($common as $extension) { | ||
| ActionlogsHelper::loadTranslationFiles($extension); | ||
| $extensionName = Text::_($extension); | ||
| $options[ApplicationHelper::stringURLSafe($extensionName) . '_' . $extension] = HTMLHelper::_('select.option', $extension, $extensionName); | ||
| } | ||
|
|
||
| ksort($options); | ||
|
|
||
| return array_merge(parent::getOptions(), array_values($options)); | ||
| } | ||
| } |
This file contains 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 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 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 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
23 changes: 0 additions & 23 deletions
23
administrator/components/com_banners/tmpl/banners/default_batch_footer.php
This file was deleted.
Oops, something went wrong.
83 changes: 83 additions & 0 deletions
83
...trator/components/com_categories/layouts/joomla/form/field/modal-select/extra-buttons.php
This file contains 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,83 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @package Joomla.Site | ||
| * @subpackage Layout | ||
| * | ||
| * @copyright (C) 2023 Open Source Matters, Inc. <https://www.joomla.org> | ||
| * @license GNU General Public License version 2 or later; see LICENSE.txt | ||
| */ | ||
|
|
||
| defined('_JEXEC') or die; | ||
|
|
||
| use Joomla\CMS\Factory; | ||
| use Joomla\CMS\Language\Text; | ||
|
|
||
| extract($displayData); | ||
|
|
||
| /** | ||
| * Layout variables | ||
| * ----------------- | ||
| * @var string $autocomplete Autocomplete attribute for the field. | ||
| * @var boolean $autofocus Is autofocus enabled? | ||
| * @var string $class Classes for the input. | ||
| * @var string $description Description of the field. | ||
| * @var boolean $disabled Is this field disabled? | ||
| * @var string $group Group the field belongs to. <fields> section in form XML. | ||
| * @var boolean $hidden Is this field hidden in the form? | ||
| * @var string $hint Placeholder for the field. | ||
| * @var string $id DOM id of the field. | ||
| * @var string $label Label of the field. | ||
| * @var string $labelclass Classes to apply to the label. | ||
| * @var boolean $multiple Does this field support multiple values? | ||
| * @var string $name Name of the input field. | ||
| * @var string $onchange Onchange attribute for the field. | ||
| * @var string $onclick Onclick attribute for the field. | ||
| * @var string $pattern Pattern (Reg Ex) of value of the form field. | ||
| * @var boolean $readonly Is this field read only? | ||
| * @var boolean $repeat Allows extensions to duplicate elements. | ||
| * @var boolean $required Is this field required? | ||
| * @var integer $size Size attribute of the input. | ||
| * @var boolean $spellcheck Spellcheck state for the form field. | ||
| * @var string $validate Validation rules to apply. | ||
| * @var string $value Value attribute of the field. | ||
| * @var string $dataAttribute Miscellaneous data attributes preprocessed for HTML output | ||
| * @var array $dataAttributes Miscellaneous data attribute for eg, data-* | ||
| * @var string $valueTitle | ||
| * @var array $canDo | ||
| * @var string[] $urls | ||
| * @var string[] $modalTitles | ||
| * @var string $language | ||
| */ | ||
|
|
||
| // Do nothing when propagate is disabled | ||
| if (empty($canDo['propagate'])) { | ||
| return; | ||
| } | ||
|
|
||
| // Scripts for backward compatibility | ||
| /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */ | ||
| $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); | ||
| $wa->useScript('field.modal-fields'); | ||
| $wa->addInlineScript( | ||
| 'window.jSelectCategory_' . $id . ' = function (id, title, object) { | ||
| window.processModalSelect("Category", "' . $id . '", id, title, "", object); | ||
| }', | ||
| ['name' => 'inline.select_category_' . $id], | ||
| ['type' => 'module'] | ||
| ); | ||
| Text::script('JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED'); | ||
|
|
||
| // Language propagate callback name | ||
| // Strip off language tag at the end | ||
| $tagLength = strlen($language); | ||
| $callbackFunctionStem = substr("jSelectCategory_" . $id, 0, -$tagLength); | ||
|
|
||
| ?> | ||
|
|
||
| <button type="button" class="btn btn-primary" <?php echo $value ? '' : 'hidden'; ?> | ||
| title="<?php echo $this->escape(Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP')); ?>" | ||
| data-show-when-value="1" | ||
| onclick="Joomla.propagateAssociation('<?php echo $id; ?>', '<?php echo $callbackFunctionStem; ?>')"> | ||
| <span class="icon-sync" aria-hidden="true"></span> <?php echo Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON'); ?> | ||
| </button> |
Oops, something went wrong.