Skip to content

Some fixes for multiple content assign to single user #10

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

Open
sanjivani1812 wants to merge 4 commits into
base: release-1.1.0
Choose a base branch
from
Open

Some fixes for multiple content assign to single user #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3db0561
Some fixes for multiple content assign to single user
sanjivani1812 Oct 19, 2018
e513db8
Method to Get roles of users again to selected agency.
sanjivani1812 Oct 19, 2018
92b69f6
Method to Get roles of users again to selected agency.
sanjivani1812 Oct 19, 2018
633269d
Some fixes for multiple content assign to single user
sanjivani1812 Oct 22, 2018
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
70 changes: 69 additions & 1 deletion src/administrator/includes/rbacl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,9 @@ public static function check($userId, $client, $action, $contentId = null)
$userModel = self::model("user");
$contentRoleId = $userModel->getAssociatedContentRole($userId, $client, $contentId);

if (in_array($contentRoleId, $allowedRoles))
$rolesAllowed = array_intersect($contentRoleId, $allowedRoles);

if (!empty($rolesAllowed))
{
return true;
}
Expand Down Expand Up @@ -199,4 +201,70 @@ public static function getRoleByUser($userId, $client = '', $clientContentIid =

return $roles;
}

/**
* Method to Get roles of users against to selected client.
*
* @param integer $contentId content id
* @param integer $userId user id
*
* @return array
*
* @since __DEPLOY_VERSION__
*/
public function getAuthorizedActions($contentId = null, $userId = null)
{
if (is_null($contentId))
{
$input = JFactory::getApplication()->input;
$contentId = $input->get('aid', '0', 'INT');
}

if (is_null($userId))
{
$userId = JFactory::getUser()->id;
}

// Get subusers actions mapp
$userRoleId = self::getRoleByUser($userId, 'com_multiagency', 0);

if (empty($userRoleId))
{
$userRoleId = self::getRoleByUser($userId, 'com_multiagency', $contentId);
}

if (!empty($userRoleId))
{
$db = JFactory::getDBO();

// Get actions mapped to roles.
$subInQuery = $db->getQuery(true);
Copy link
Contributor

@thite-amol thite-amol Oct 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sanjivani1812 Move the DB operations in the model

Copy link
Contributor Author

@sanjivani1812 sanjivani1812 Oct 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thite-amol - getRoleByUser function having DB operation so I put there. Can please suggest a model name.

$subInQuery->select('action_id')
->from($db->quoteName('#__tjsu_role_action_map'))
->where($db->quoteName('role_id') . 'IN(' . implode(',', $userRoleId) . ')');
$db->setQuery($subInQuery);

$roleActions = $db->loadColumn();

if ($roleActions && !empty($contentId))
{
/* Get the roles again to cotent id.
* e.g. One content is Agency and agency having multiple roles manager, staff, employee
* One user having two different roles for two different agency. then If I pass then agency id then query give us mapped actions agains to agency.
*/
$query = $db->getQuery(true);
$query->select('m.role_id,r.name, count( m.action_id) as actionCount, (select count(aa.action_id)
FROM #__tjsu_role_action_map aa WHERE aa.role_id = m.role_id) as roleCount');
$query->from($db->quoteName('#__tjsu_role_action_map', 'm'));
$query->join('INNER', $db->quoteName('#__tjsu_actions', 'a') . ' ON (' . $db->quoteName('a.id') . ' = ' . $db->quoteName('m.action_id') . ')');
$query->join('INNER', $db->quoteName('#__tjsu_roles', 'r') . ' ON (' . $db->quoteName('r.id') . ' = ' . $db->quoteName('m.role_id') . ')');
$query->where($db->quoteName('m.action_id') . ' IN (' . implode(',', $roleActions) . ')');
$query->group($db->quoteName('m.role_id'));
$query->having('roleCount <= actionCount');
$db->setQuery($query);

return $db->loadAssocList();
}
}
}
}
13 changes: 9 additions & 4 deletions src/administrator/models/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ protected function loadFormData()
* @param string $client The name of the client to authorise. com_content
* @param integer $contentId The content key. null check with role and allowed actions.
*
* @return integer The role id
* @return array The role id
*
* @since __DEPLOY_VERSION__
*/
public function getAssociatedContentRole($userId, $client, $contentId)
public function getAssociatedContentRole($userId, $client, $contentId = null)
{
$db = Factory::getDbo();
$query = $db->getQuery(true);
Expand All @@ -115,9 +115,14 @@ public function getAssociatedContentRole($userId, $client, $contentId)
$query->from($db->quoteName('#__tjsu_users'));
$query->where($db->quoteName('user_id') . " = " . (int) $userId);
$query->where($db->quoteName('client') . " = " . $db->q($client));
$query->where($db->quoteName('client_id') . " = " . (int) $contentId);

if (!is_null($contentId))
{
$query->where($db->quoteName('client_id') . " = " . $db->quote($contentId));
}

$db->setQuery($query);

return $db->loadResult();
return $db->loadColumn();
}
}