From 37152137ed77653b1c62c0063e27977c4b7fbe06 Mon Sep 17 00:00:00 2001 From: Kishori Karale Date: Mon, 10 Oct 2022 11:18:31 +0530 Subject: [PATCH 1/3] Task #189115 feat: com_subusers improvements --- src/administrator/controller.php | 2 +- src/administrator/controllers/action.php | 2 +- src/administrator/controllers/actions.php | 2 +- src/administrator/controllers/database.php | 2 +- src/administrator/controllers/mapping.php | 13 +++- src/administrator/controllers/mappings.php | 69 ++++++++++++++++++- src/administrator/controllers/role.php | 2 +- src/administrator/controllers/roles.php | 2 +- src/administrator/controllers/user.php | 2 +- src/administrator/controllers/users.php | 2 +- src/administrator/helpers/subusers.php | 2 +- src/administrator/includes/rbacl.php | 2 +- src/administrator/libraries/action.php | 2 +- src/administrator/libraries/role.php | 2 +- src/administrator/models/action.php | 2 +- src/administrator/models/actions.php | 2 +- src/administrator/models/database.php | 2 +- src/administrator/models/fields/role.php | 2 +- src/administrator/models/mapping.php | 2 +- src/administrator/models/mappings.php | 2 +- src/administrator/models/role.php | 2 +- src/administrator/models/roles.php | 2 +- src/administrator/models/user.php | 2 +- src/administrator/models/users.php | 2 +- src/administrator/subusers.php | 2 +- src/administrator/tables/action.php | 2 +- src/administrator/tables/mapping.php | 2 +- src/administrator/tables/role.php | 2 +- src/administrator/tables/user.php | 2 +- src/administrator/views/action/view.html.php | 2 +- src/administrator/views/actions/view.html.php | 2 +- src/administrator/views/mapping/tmpl/edit.php | 9 +-- src/administrator/views/mapping/view.html.php | 2 +- .../views/mappings/tmpl/default.php | 4 +- .../views/mappings/view.html.php | 5 +- src/administrator/views/role/view.html.php | 2 +- .../views/roles/tmpl/default.php | 5 +- src/administrator/views/roles/view.html.php | 5 +- src/administrator/views/user/view.html.php | 2 +- src/administrator/views/users/view.html.php | 2 +- 40 files changed, 129 insertions(+), 47 deletions(-) diff --git a/src/administrator/controller.php b/src/administrator/controller.php index 91935e1..9b4f2ae 100755 --- a/src/administrator/controller.php +++ b/src/administrator/controller.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/controllers/action.php b/src/administrator/controllers/action.php index aa782ea..b923a00 100755 --- a/src/administrator/controllers/action.php +++ b/src/administrator/controllers/action.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/controllers/actions.php b/src/administrator/controllers/actions.php index 4044816..1979e81 100755 --- a/src/administrator/controllers/actions.php +++ b/src/administrator/controllers/actions.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/controllers/database.php b/src/administrator/controllers/database.php index 1bab1a4..690eb77 100755 --- a/src/administrator/controllers/database.php +++ b/src/administrator/controllers/database.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/controllers/mapping.php b/src/administrator/controllers/mapping.php index 09b02ca..fbbafb9 100755 --- a/src/administrator/controllers/mapping.php +++ b/src/administrator/controllers/mapping.php @@ -4,10 +4,11 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ +// No direct access defined('_JEXEC') or die; use Joomla\CMS\MVC\Controller\FormController; @@ -19,4 +20,14 @@ */ class SubusersControllerMapping extends FormController { + /** + * Constructor + * + * @throws Exception + */ + public function __construct() + { + $this->view_list = 'mappings'; + parent::__construct(); + } } diff --git a/src/administrator/controllers/mappings.php b/src/administrator/controllers/mappings.php index f66a489..a9c9350 100755 --- a/src/administrator/controllers/mappings.php +++ b/src/administrator/controllers/mappings.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ @@ -12,6 +12,7 @@ defined('_JEXEC') or die; use Joomla\CMS\MVC\Controller\AdminController; +use Joomla\Utilities\ArrayHelper; /** * Mappings list controller class. @@ -20,6 +21,39 @@ */ class SubusersControllerMappings extends AdminController { + /** + * Method to clone existing Mappings + * + * @return void + */ + public function duplicate() + { + // Check for request forgeries + Jsession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + + // Get id(s) + $pks = $this->input->post->get('cid', array(), 'array'); + + try + { + if (empty($pks)) + { + throw new Exception(JText::_('COM_SUBUSERS_NO_ELEMENT_SELECTED')); + } + + ArrayHelper::toInteger($pks); + $model = $this->getModel(); + $model->duplicate($pks); + $this->setMessage(Jtext::_('COM_SUBUSERS_ITEMS_SUCCESS_DUPLICATED')); + } + catch (Exception $e) + { + JFactory::getApplication()->enqueueMessage($e->getMessage(), 'warning'); + } + + $this->setRedirect('index.php?option=com_subusers&view=mappings'); + } + /** * Proxy for getModel. * @@ -35,4 +69,37 @@ public function getModel($name = 'mapping', $prefix = 'SubusersModel', $config = { return parent::getModel($name, $prefix, array('ignore_request' => true)); } + + /** + * Method to save the submitted ordering values for records via AJAX. + * + * @return void + * + * @since 3.0 + */ + public function saveOrderAjax() + { + // Get the input + $input = JFactory::getApplication()->input; + $pks = $input->post->get('cid', array(), 'array'); + $order = $input->post->get('order', array(), 'array'); + + // Sanitize the input + ArrayHelper::toInteger($pks); + ArrayHelper::toInteger($order); + + // Get the model + $model = $this->getModel(); + + // Save the ordering + $return = $model->saveorder($pks, $order); + + if ($return) + { + echo "1"; + } + + // Close the application + JFactory::getApplication()->close(); + } } diff --git a/src/administrator/controllers/role.php b/src/administrator/controllers/role.php index d7f3013..6170e2d 100755 --- a/src/administrator/controllers/role.php +++ b/src/administrator/controllers/role.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/controllers/roles.php b/src/administrator/controllers/roles.php index 5cad871..df38804 100755 --- a/src/administrator/controllers/roles.php +++ b/src/administrator/controllers/roles.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/controllers/user.php b/src/administrator/controllers/user.php index 3d41993..58ef7f7 100755 --- a/src/administrator/controllers/user.php +++ b/src/administrator/controllers/user.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/controllers/users.php b/src/administrator/controllers/users.php index d149fae..8b6b620 100755 --- a/src/administrator/controllers/users.php +++ b/src/administrator/controllers/users.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/helpers/subusers.php b/src/administrator/helpers/subusers.php index 8f15faf..ab7a9f0 100755 --- a/src/administrator/helpers/subusers.php +++ b/src/administrator/helpers/subusers.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/includes/rbacl.php b/src/administrator/includes/rbacl.php index 79532ed..bb55c05 100644 --- a/src/administrator/includes/rbacl.php +++ b/src/administrator/includes/rbacl.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/libraries/action.php b/src/administrator/libraries/action.php index b28aee9..3822273 100644 --- a/src/administrator/libraries/action.php +++ b/src/administrator/libraries/action.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/libraries/role.php b/src/administrator/libraries/role.php index 9afbd83..ce92559 100644 --- a/src/administrator/libraries/role.php +++ b/src/administrator/libraries/role.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/models/action.php b/src/administrator/models/action.php index bf44e68..4fdbe2f 100755 --- a/src/administrator/models/action.php +++ b/src/administrator/models/action.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/models/actions.php b/src/administrator/models/actions.php index 73f9724..89fa085 100755 --- a/src/administrator/models/actions.php +++ b/src/administrator/models/actions.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/models/database.php b/src/administrator/models/database.php index 791fc0c..d0486df 100755 --- a/src/administrator/models/database.php +++ b/src/administrator/models/database.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/models/fields/role.php b/src/administrator/models/fields/role.php index 7afc333..095e82d 100644 --- a/src/administrator/models/fields/role.php +++ b/src/administrator/models/fields/role.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/models/mapping.php b/src/administrator/models/mapping.php index ba3ac80..11f1e1f 100755 --- a/src/administrator/models/mapping.php +++ b/src/administrator/models/mapping.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/models/mappings.php b/src/administrator/models/mappings.php index f0510c0..fe3e55e 100755 --- a/src/administrator/models/mappings.php +++ b/src/administrator/models/mappings.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/models/role.php b/src/administrator/models/role.php index 64ce006..cd83518 100755 --- a/src/administrator/models/role.php +++ b/src/administrator/models/role.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/models/roles.php b/src/administrator/models/roles.php index 691b0f5..373632c 100755 --- a/src/administrator/models/roles.php +++ b/src/administrator/models/roles.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/models/user.php b/src/administrator/models/user.php index 7c31e52..b814b2b 100755 --- a/src/administrator/models/user.php +++ b/src/administrator/models/user.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/models/users.php b/src/administrator/models/users.php index e3f9814..a054d5c 100755 --- a/src/administrator/models/users.php +++ b/src/administrator/models/users.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/subusers.php b/src/administrator/subusers.php index bbfc51a..c971a1c 100755 --- a/src/administrator/subusers.php +++ b/src/administrator/subusers.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/tables/action.php b/src/administrator/tables/action.php index 43577ab..03857c6 100755 --- a/src/administrator/tables/action.php +++ b/src/administrator/tables/action.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/tables/mapping.php b/src/administrator/tables/mapping.php index c1a1847..a6f26af 100755 --- a/src/administrator/tables/mapping.php +++ b/src/administrator/tables/mapping.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/tables/role.php b/src/administrator/tables/role.php index 92f436e..d71063d 100755 --- a/src/administrator/tables/role.php +++ b/src/administrator/tables/role.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/tables/user.php b/src/administrator/tables/user.php index 0cff5cb..5a16eb7 100755 --- a/src/administrator/tables/user.php +++ b/src/administrator/tables/user.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/views/action/view.html.php b/src/administrator/views/action/view.html.php index 3b0ca40..a7b2729 100755 --- a/src/administrator/views/action/view.html.php +++ b/src/administrator/views/action/view.html.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/views/actions/view.html.php b/src/administrator/views/actions/view.html.php index 249b522..324251e 100755 --- a/src/administrator/views/actions/view.html.php +++ b/src/administrator/views/actions/view.html.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/views/mapping/tmpl/edit.php b/src/administrator/views/mapping/tmpl/edit.php index 960d6c2..d56c41f 100755 --- a/src/administrator/views/mapping/tmpl/edit.php +++ b/src/administrator/views/mapping/tmpl/edit.php @@ -1,10 +1,11 @@ - * @copyright Copyright (C) 2009 - 2018 Techjoomla. All rights reserved. - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @author Techjoomla + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. + * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ defined('_JEXEC') or die; diff --git a/src/administrator/views/mapping/view.html.php b/src/administrator/views/mapping/view.html.php index 05b63ce..c1c460f 100755 --- a/src/administrator/views/mapping/view.html.php +++ b/src/administrator/views/mapping/view.html.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/views/mappings/tmpl/default.php b/src/administrator/views/mappings/tmpl/default.php index c08cb13..f7e2903 100755 --- a/src/administrator/views/mappings/tmpl/default.php +++ b/src/administrator/views/mappings/tmpl/default.php @@ -3,7 +3,7 @@ * @package Subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2018 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -133,4 +133,4 @@ - \ No newline at end of file + diff --git a/src/administrator/views/mappings/view.html.php b/src/administrator/views/mappings/view.html.php index 6adb191..54d2431 100755 --- a/src/administrator/views/mappings/view.html.php +++ b/src/administrator/views/mappings/view.html.php @@ -4,10 +4,10 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ - +// No direct access defined('_JEXEC') or die; use Joomla\CMS\Factory; @@ -103,6 +103,7 @@ public function display($tpl = null) } SubusersHelper::addSubmenu('mappings'); + $this->addToolbar(); $this->sidebar = JHtmlSidebar::render(); diff --git a/src/administrator/views/role/view.html.php b/src/administrator/views/role/view.html.php index 4c32d97..1628e05 100755 --- a/src/administrator/views/role/view.html.php +++ b/src/administrator/views/role/view.html.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/views/roles/tmpl/default.php b/src/administrator/views/roles/tmpl/default.php index c017d2d..942a7aa 100755 --- a/src/administrator/views/roles/tmpl/default.php +++ b/src/administrator/views/roles/tmpl/default.php @@ -3,10 +3,11 @@ * @package Subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2018 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ +// No direct access defined('_JEXEC') or die; use Joomla\CMS\HTML\HTMLHelper; @@ -132,4 +133,4 @@ - \ No newline at end of file + diff --git a/src/administrator/views/roles/view.html.php b/src/administrator/views/roles/view.html.php index 028a8f5..6343510 100755 --- a/src/administrator/views/roles/view.html.php +++ b/src/administrator/views/roles/view.html.php @@ -4,10 +4,10 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ - +// No direct access defined('_JEXEC') or die; use Joomla\CMS\Factory; @@ -102,6 +102,7 @@ public function display($tpl = null) } SubusersHelper::addSubmenu('roles'); + $this->addToolbar(); $this->sidebar = JHtmlSidebar::render(); diff --git a/src/administrator/views/user/view.html.php b/src/administrator/views/user/view.html.php index 935ed18..068d88f 100755 --- a/src/administrator/views/user/view.html.php +++ b/src/administrator/views/user/view.html.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ diff --git a/src/administrator/views/users/view.html.php b/src/administrator/views/users/view.html.php index 095fb58..e89dafa 100755 --- a/src/administrator/views/users/view.html.php +++ b/src/administrator/views/users/view.html.php @@ -4,7 +4,7 @@ * @subpackage com_subusers * * @author Techjoomla - * @copyright Copyright (C) 2009 - 2019 Techjoomla. All rights reserved. + * @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved. * @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL */ From 87b9e683f49e2e97fa473273f14427edb5722960 Mon Sep 17 00:00:00 2001 From: Kishori Karale Date: Mon, 10 Oct 2022 11:24:29 +0530 Subject: [PATCH 2/3] Task #189115 feat: com_subusers improvements --- src/administrator/controllers/mapping.php | 10 ---- src/administrator/controllers/mappings.php | 66 ---------------------- 2 files changed, 76 deletions(-) diff --git a/src/administrator/controllers/mapping.php b/src/administrator/controllers/mapping.php index fbbafb9..14d5be7 100755 --- a/src/administrator/controllers/mapping.php +++ b/src/administrator/controllers/mapping.php @@ -20,14 +20,4 @@ */ class SubusersControllerMapping extends FormController { - /** - * Constructor - * - * @throws Exception - */ - public function __construct() - { - $this->view_list = 'mappings'; - parent::__construct(); - } } diff --git a/src/administrator/controllers/mappings.php b/src/administrator/controllers/mappings.php index a9c9350..d7a73b5 100755 --- a/src/administrator/controllers/mappings.php +++ b/src/administrator/controllers/mappings.php @@ -21,39 +21,6 @@ */ class SubusersControllerMappings extends AdminController { - /** - * Method to clone existing Mappings - * - * @return void - */ - public function duplicate() - { - // Check for request forgeries - Jsession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); - - // Get id(s) - $pks = $this->input->post->get('cid', array(), 'array'); - - try - { - if (empty($pks)) - { - throw new Exception(JText::_('COM_SUBUSERS_NO_ELEMENT_SELECTED')); - } - - ArrayHelper::toInteger($pks); - $model = $this->getModel(); - $model->duplicate($pks); - $this->setMessage(Jtext::_('COM_SUBUSERS_ITEMS_SUCCESS_DUPLICATED')); - } - catch (Exception $e) - { - JFactory::getApplication()->enqueueMessage($e->getMessage(), 'warning'); - } - - $this->setRedirect('index.php?option=com_subusers&view=mappings'); - } - /** * Proxy for getModel. * @@ -69,37 +36,4 @@ public function getModel($name = 'mapping', $prefix = 'SubusersModel', $config = { return parent::getModel($name, $prefix, array('ignore_request' => true)); } - - /** - * Method to save the submitted ordering values for records via AJAX. - * - * @return void - * - * @since 3.0 - */ - public function saveOrderAjax() - { - // Get the input - $input = JFactory::getApplication()->input; - $pks = $input->post->get('cid', array(), 'array'); - $order = $input->post->get('order', array(), 'array'); - - // Sanitize the input - ArrayHelper::toInteger($pks); - ArrayHelper::toInteger($order); - - // Get the model - $model = $this->getModel(); - - // Save the ordering - $return = $model->saveorder($pks, $order); - - if ($return) - { - echo "1"; - } - - // Close the application - JFactory::getApplication()->close(); - } } From f3893a665354b6317fa0929a9131efbe3f40a17a Mon Sep 17 00:00:00 2001 From: Kishori Karale Date: Mon, 10 Oct 2022 11:42:48 +0530 Subject: [PATCH 3/3] Task #189115 feat: com_subusers improvements --- src/administrator/sql/install.mysql.utf8.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/administrator/sql/install.mysql.utf8.sql b/src/administrator/sql/install.mysql.utf8.sql index 6929ca2..b5a118d 100755 --- a/src/administrator/sql/install.mysql.utf8.sql +++ b/src/administrator/sql/install.mysql.utf8.sql @@ -59,3 +59,7 @@ CREATE TABLE IF NOT EXISTS `#__tjsu_users` ( `modified_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `#__tjsu_roles` (`id`, `name`, `client`, `created_by`, `created_date`, `modified_by`, `modified_date`, `ordering`) VALUES +(1, 'Organization Manager', 'com_multiagency', 0, '0000-00-00 00:00:00', 0, '0000-00-00 00:00:00', 1), +(2, 'Organization User', 'com_multiagency', 0, '0000-00-00 00:00:00', 0, '0000-00-00 00:00:00', 2);