Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
ed6bca1
Revamp mapping view
Jul 27, 2018
61d63d3
Merge branch 'master' of github.com:techjoomla/com_subusers
Jul 27, 2018
f75f2a8
Merge pull request #5 from thite-amol/master
thite-amol Sep 19, 2018
3341eca
Feature #8 feat: Added role and client filters for users list
Oct 17, 2018
6767794
Merge pull request #9 from praneettekdi/add_role_and_client_filter
thite-amol Oct 19, 2018
3475e58
Bug #147535 fix: Backend : Com_subuser view (Actions,Role Action Mapp…
deepa-g Jul 15, 2019
428cd49
Bug #147535 fix: Backend : Com_subuser view (Actions,Role Action Mapp…
deepa-g Jul 17, 2019
23e1539
Merge pull request #11 from deepa-g/release-1.1.0
thite-amol Jul 19, 2019
eb54e22
Task #14 chore: Update the doc comment
Aug 7, 2019
36421f1
Task #14 chore: Update the doc comment
Aug 7, 2019
9fd8f56
Merge pull request #15 from thite-amol/release-1.1.0
thite-amol Aug 7, 2019
69b97fa
Get assigned roles by providing array of multiple action ids
tushar33 Sep 17, 2019
3a5e71b
Merge branch 'release-1.1.0' into action-changes
tushar33 Sep 23, 2019
b7b4220
Resolve conflicts
tushar33 Sep 23, 2019
1c0a569
Merge branch 'action-changes' of https://github.com/tushar33/com_subu…
tushar33 Sep 23, 2019
99a70fa
Task #19:Get users by adding state and multiple role filter
tushar33 Sep 25, 2019
5fb5905
Merge pull request #21 from tushar33/users-changes
thite-amol Oct 23, 2019
d4a0e44
Feature #155819 chore: Upgrade com_subuser
pravinTek Jan 9, 2020
af86fe1
Merge pull request #20 from tushar33/action-changes
thite-amol Feb 19, 2020
fb5934d
Merge pull request #23 from pravinTek/subformdpe
thite-amol Feb 19, 2020
3715213
Task #189115 feat: com_subusers improvements
Oct 10, 2022
87b9e68
Task #189115 feat: com_subusers improvements
Oct 10, 2022
f3893a6
Task #189115 feat: com_subusers improvements
Oct 10, 2022
96b0c9e
Merge pull request #27 from KishoriBKarale/code
vijaykhollam Oct 10, 2022
0260ce8
Task #189115 feat: com_subusers improvements
Oct 10, 2022
9cc27c1
Merge remote-tracking branch 'upstream/release-1.1.0' into code
Oct 10, 2022
9fedc62
Task #189115 feat: com_subusers improvements
Oct 10, 2022
66ec4cc
Task #189115 feat: com_subusers improvements
Oct 10, 2022
4a79786
Task #189115 feat: com_subusers improvements
Oct 10, 2022
5a349ea
Task #189115 feat: com_subusers improvements
Oct 10, 2022
9681cbe
Task #189115 feat: com_subusers improvements
Oct 10, 2022
3bcd172
Task #189115 feat: com_subusers improvements
Oct 10, 2022
cf47f48
Task #189115 feat: com_subusers improvements
Oct 10, 2022
e59a255
Task #189115 feat: com_subusers improvements
Oct 10, 2022
bf128c8
Task #189115 feat: com_subusers improvements
Oct 10, 2022
e1ceab9
Task #189115 feat: com_subusers improvements
Oct 10, 2022
084522c
Task #189115 feat: com_subusers improvements
Oct 11, 2022
dc6001a
Task #189115 chore: Updated Indexing and table changes
Nov 4, 2022
754ab1f
Merge pull request #28 from KishoriBKarale/code
vijaykhollam Nov 4, 2022
92574d1
Task #189115 chore: Updated Indexing
Nov 5, 2022
a374b21
Merge remote-tracking branch 'upstream/release-1.1.0' into code
Nov 5, 2022
81b1a9f
Merge pull request #29 from KishoriBKarale/code
vijaykhollam Nov 5, 2022
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
9 changes: 5 additions & 4 deletions src/administrator/controller.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?php
/**
* @package Subusers
* @package Subusers
* @subpackage com_subusers
*
* @author Techjoomla <extensions@techjoomla.com>
* @copyright Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @author Techjoomla <extensions@techjoomla.com>
* @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;
Expand Down
9 changes: 5 additions & 4 deletions src/administrator/controllers/action.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?php
/**
* @package Subusers
* @package Subusers
* @subpackage com_subusers
*
* @author Techjoomla <extensions@techjoomla.com>
* @copyright Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @author Techjoomla <extensions@techjoomla.com>
* @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved.
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
*/

// No direct access
Expand Down
10 changes: 6 additions & 4 deletions src/administrator/controllers/actions.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<?php
/**
* @package Subusers
* @package Subusers
* @subpackage com_subusers
*
* @author Techjoomla <extensions@techjoomla.com>
* @copyright Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @author Techjoomla <extensions@techjoomla.com>
* @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();

use Joomla\CMS\MVC\Controller\AdminController;
Expand Down
23 changes: 15 additions & 8 deletions src/administrator/controllers/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,25 @@
/**
* @package Subusers
* @subpackage com_subusers
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* @author Techjoomla <extensions@techjoomla.com>
* @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;

use Joomla\CMS\MVC\Controller\BaseController;
use Joomla\CMS\Factory;
use Joomla\CMS\MVC\Model\BaseDatabaseModel;
use Joomla\CMS\Router\Route;

/**
* Installer Database Controller
*
* @since 2.5
*/
class SubusersControllerDatabase extends JControllerLegacy
class SubusersControllerDatabase extends BaseController
{
/**
* Tries to fix missing database updates
Expand All @@ -26,19 +33,19 @@ class SubusersControllerDatabase extends JControllerLegacy
public function fix()
{
// Get a handle to the Joomla! application object
$application = JFactory::getApplication();
$application = Factory::getApplication();

$model = $this->getModel('database');
$model->fix();

// Purge updates
JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_joomlaupdate/models', 'JoomlaupdateModel');
$updateModel = JModelLegacy::getInstance('default', 'JoomlaupdateModel');
BaseDatabaseModel::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_joomlaupdate/models', 'JoomlaupdateModel');
$updateModel = BaseDatabaseModel::getInstance('default', 'JoomlaupdateModel');
$updateModel->purge();

// Refresh versionable assets cache
JFactory::getApplication()->flushAssets();
Factory::getApplication()->flushAssets();

$this->setRedirect(JRoute::_('index.php?option=com_subusers&view=organizations', false));
$this->setRedirect(Route::_('index.php?option=com_subusers&view=organizations', false));
}
}
27 changes: 9 additions & 18 deletions src/administrator/controllers/mapping.php
Original file line number Diff line number Diff line change
@@ -1,32 +1,23 @@
<?php
/**
* @version CVS: 1.0.0
* @package Com_Subusers
* @author Techjoomla <contact@techjoomla.com>
* @copyright Copyright (c) 2009-2017 TechJoomla, Tekdi Technologies Pvt. Ltd. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @package Subusers
* @subpackage com_subusers
*
* @author Techjoomla <extensions@techjoomla.com>
* @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;

jimport('joomla.application.component.controllerform');
use Joomla\CMS\MVC\Controller\FormController;

/**
* Mapping controller class.
*
* @since 1.6
* @since 1.0.0
*/
class SubusersControllerMapping extends JControllerForm
class SubusersControllerMapping extends FormController
{
/**
* Constructor
*
* @throws Exception
*/
public function __construct()
{
$this->view_list = 'mappings';
parent::__construct();
}
}
92 changes: 12 additions & 80 deletions src/administrator/controllers/mappings.php
Original file line number Diff line number Diff line change
@@ -1,107 +1,39 @@
<?php
/**
* @version CVS: 1.0.0
* @package Com_Subusers
* @author Techjoomla <contact@techjoomla.com>
* @copyright Copyright (c) 2009-2017 TechJoomla, Tekdi Technologies Pvt. Ltd. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @package Subusers
* @subpackage com_subusers
*
* @author Techjoomla <extensions@techjoomla.com>
* @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;

jimport('joomla.application.component.controlleradmin');

use Joomla\CMS\MVC\Controller\AdminController;
use Joomla\Utilities\ArrayHelper;

/**
* Mappings list controller class.
*
* @since 1.6
* @since 1.0.0
*/
class SubusersControllerMappings extends JControllerAdmin
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.
*
* @param string $name Optional. Model name
* @param string $prefix Optional. Class prefix
* @param array $config Optional. Configuration array for model
*
* @return object The Model
* @return \Joomla\CMS\MVC\Model\BaseDatabaseModel|boolean The Model
*
* @since 1.6
* @since 1.0.0
*/
public function getModel($name = 'mapping', $prefix = 'SubusersModel', $config = array())
{
$model = parent::getModel($name, $prefix, array('ignore_request' => true));

return $model;
}

/**
* 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();
return parent::getModel($name, $prefix, array('ignore_request' => true));
}
}
9 changes: 5 additions & 4 deletions src/administrator/controllers/role.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?php
/**
* @package Subusers
* @package Subusers
* @subpackage com_subusers
*
* @author Techjoomla <extensions@techjoomla.com>
* @copyright Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @author Techjoomla <extensions@techjoomla.com>
* @copyright Copyright (C) 2009 - 2022 Techjoomla. All rights reserved.
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
*/

// No direct access
Expand Down
9 changes: 5 additions & 4 deletions src/administrator/controllers/roles.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?php
/**
* @package Subusers
* @package Subusers
* @subpackage com_subusers
*
* @author Techjoomla <extensions@techjoomla.com>
* @copyright Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @author Techjoomla <extensions@techjoomla.com>
* @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;
Expand Down
9 changes: 5 additions & 4 deletions src/administrator/controllers/user.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?php
/**
* @package Subusers
* @package Subusers
* @subpackage com_subusers
*
* @author Techjoomla <extensions@techjoomla.com>
* @copyright Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @author Techjoomla <extensions@techjoomla.com>
* @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;
Expand Down
9 changes: 5 additions & 4 deletions src/administrator/controllers/users.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?php
/**
* @package Subusers
* @package Subusers
* @subpackage com_subusers
*
* @author Techjoomla <extensions@techjoomla.com>
* @copyright Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @author Techjoomla <extensions@techjoomla.com>
* @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;
Expand Down
Loading