Skip to content

Task #166370 feat: use namespace in overall product #61

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

Merged
ankush-maherwal merged 1 commit into from
Apr 29, 2022
Merged

Task #166370 feat: use namespace in overall product #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions administrator/models/hierarchy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public function save($data)
// On before assigning manager
PluginHelper::importPlugin("system");
PluginHelper::importPlugin("actionlog");
Factory::getApplication()->triggerEvent("hierarchyOnBeforeSaveHierarchy", array($data, $isNew));
Factory::getApplication()->triggerEvent("onBeforeHierarchySaveHierarchy", array($data, $isNew));

if (parent::save($data))
{
Expand All @@ -185,7 +185,7 @@ public function save($data)
// On after assigning manager
PluginHelper::importPlugin("system");
PluginHelper::importPlugin("actionlog");
Factory::getApplication()->triggerEvent("hierarchyOnAfterSaveHierarchy", array($data, $isNew));
Factory::getApplication()->triggerEvent("onAfterHierarchySaveHierarchy", array($data, $isNew));

return $id;
}
Expand Down Expand Up @@ -404,14 +404,14 @@ public function delete(&$pks)
// On before removing manager
PluginHelper::importPlugin("system");
PluginHelper::importPlugin("actionlog");
Factory::getApplication()->triggerEvent("hierarchyOnBeforeDeleteHierarchy", array($data));
Factory::getApplication()->triggerEvent("onBeforeHierarchyDeleteHierarchy", array($data));

if ($hierarchyTable->delete($data['id']))
{
// On after removing manager
PluginHelper::importPlugin("system");
PluginHelper::importPlugin("actionlog");
Factory::getApplication()->triggerEvent("hierarchyOnAfterDeleteHierarchy", array($data));
Factory::getApplication()->triggerEvent("onAfterHierarchyDeleteHierarchy", array($data));
}
else
{
Expand All @@ -429,14 +429,14 @@ public function delete(&$pks)
// On before removing manager
PluginHelper::importPlugin("system");
PluginHelper::importPlugin("actionlog");
Factory::getApplication()->triggerEvent("hierarchyOnBeforeDeleteHierarchy", array($data));
Factory::getApplication()->triggerEvent("onBeforeHierarchyDeleteHierarchy", array($data));

if ($hierarchyTable->delete($data['id']))
{
// On after removing manager
PluginHelper::importPlugin("system");
PluginHelper::importPlugin("actionlog");
Factory::getApplication()->triggerEvent("hierarchyOnAfterDeleteHierarchy", array($data));
Factory::getApplication()->triggerEvent("onAfterHierarchyDeleteHierarchy", array($data));
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions hierarchy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.0" method="upgrade">
<name>com_hierarchy</name>
<creationDate>22nd Jul 2021</creationDate>
<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
<creationDate>29th Apr 2022</creationDate>
<copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<author>Techjoomla</author>
<authorEmail>extensions@techjoomla.com</authorEmail>
<authorUrl>https://techjoomla.com</authorUrl>
<version>1.1.3</version>
<version>2.0.0</version>
<description>This tool will let the admin set a ‘Reports to’ field for each user in the system. This will be updated en masse using a CSV</description>

<install> <!-- Runs on install -->
Expand Down
4 changes: 2 additions & 2 deletions plugins/actionlog/hierarchy/hierarchy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ protected function addLog($messages, $messageLanguageKey, $context, $userId = nu
*
* @since 1.1.1
*/
public function hierarchyOnAfterSaveHierarchy($data, $isNew)
public function onAfterHierarchySaveHierarchy($data, $isNew)
{
if (!$this->params->get('logActionForAssigningManager', 1) || !$isNew)
{
Expand Down Expand Up @@ -120,7 +120,7 @@ public function hierarchyOnAfterSaveHierarchy($data, $isNew)
*
* @since 1.1.1
*/
public function hierarchyOnAfterDeleteHierarchy($data)
public function onAfterHierarchyDeleteHierarchy($data)
{
if (!$this->params->get('logActionForRemoveManager', 1) || empty($data['id']))
{
Expand Down
6 changes: 3 additions & 3 deletions plugins/actionlog/hierarchy/hierarchy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<extension version="3.4" type="plugin" group="actionlog" method="upgrade">
<name>plg_actionlog_hierarchy</name>
<version>1.1.3</version>
<creationDate>22nd Jul 2021</creationDate>
<version>2.0.0</version>
<creationDate>29th Apr 2022</creationDate>
<author>Techjoomla</author>
<authorEmail>extensions@techjoomla.com</authorEmail>
<authorUrl>https://techjoomla.com</authorUrl>
<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
<copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<description>PLG_ACTIONLOG_HIERARCHY_XML_DESCRIPTION</description>
<files>
Expand Down
6 changes: 3 additions & 3 deletions plugins/privacy/hierarchy/hierarchy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<extension version="3.4" type="plugin" group="privacy" method="upgrade">
<name>plg_privacy_hierarchy</name>
<version>1.1.3</version>
<creationDate>22nd Jul 2021</creationDate>
<version>2.0.0</version>
<creationDate>29th Apr 2022</creationDate>
<author>Techjoomla</author>
<authorEmail>extensions@techjoomla.com</authorEmail>
<authorUrl>https://techjoomla.com</authorUrl>
<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
<copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
<description>PLG_PRIVACY_HIERARCHY_XML_DESCRIPTION</description>
<files>
Expand Down
2 changes: 1 addition & 1 deletion script.hierarchy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* @version SVN: <svn_id>
* @package Com_Hierarchy
* @copyright Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.
* @copyright Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.
* @license GNU General Public License version 2 or later; see http://www.gnu.org/licenses/gpl-2.0.html
* Hierarchy Management Extension is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
Expand Down