Skip to content

Commit

Permalink
Merge pull request osTicket#3004 from protich/feature/deptaccess
Browse files Browse the repository at this point in the history 
Department  Access and Membership

Reviewed-By: Jared Hancock <[email protected]>
  • Loading branch information
@greezybacon
greezybacon committed Apr 24, 2016
2 parents f16baca + 6cca383 commit c7e3dbd
Show file tree
Hide file tree
Showing 4 changed files with 138 additions and 53 deletions.
85 changes: 68 additions & 17 deletions include/class.dept.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ class Dept extends VerySimpleModel
);

var $_members;
var $_primary_members;
var $_extended_members;

var $_groupids;
var $config;

Expand Down Expand Up @@ -182,16 +185,8 @@ function getMembers($criteria=null) {
'onvacation' => 0,
));
}
switch ($cfg->getAgentNameFormat()) {
case 'last':
case 'lastfirst':
case 'legal':
$members->order_by('lastname', 'firstname');
break;

default:
$members->order_by('firstname', 'lastname');
}

$members = Staff::nsort($members);

if ($criteria)
return $members;
Expand All @@ -205,6 +200,42 @@ function getAvailableMembers() {
return $this->getMembers(array('available'=>1));
}

function getPrimaryMembers() {

if (!isset($this->_primary_members)) {
$members = clone $this->getMembers();
$members->filter(array('dept_id' =>$this->getId()));
$members = Staff::nsort($members);
$this->_primary_members = $members->all();
}

return $this->_primary_members;
}

function getExtendedMembers() {

if (!isset($this->_exended_members)) {
// We need a query set so we can sort the names
$members = StaffDeptAccess::objects();
$members->filter(array('dept_id' => $this->getId()));
$members = Staff::nsort($members, 'staff__');
$extended = array();
foreach($members->all() as $member) {
if (!$member->staff) continue;
// Annoted the staff model with alerts and role
$extended[] = new AnnotatedModel($member->staff, array(
'alerts' => $member->isAlertsEnabled(),
'role_id' => $member->role_id,
)
);
}

$this->_extended_members = $extended;
}

return $this->_extended_members;
}

// Get members eligible members only
function getAssignees() {

Expand Down Expand Up @@ -305,10 +336,10 @@ function isMember($staff) {
if (is_object($staff))
$staff = $staff->getId();

// Members are indexed by ID
$members = $this->getMembers();
$members = $this->getMembers() ?: $this->members;

return ($members && isset($members[$staff]));
return ($members->findFirst(array(
'staff_id' => $staff)));
}

function isPublic() {
Expand Down Expand Up @@ -657,11 +688,21 @@ function updateAccess($access, &$errors) {
unset($dropped[$staff_id]);
if (!$role_id || !Role::lookup($role_id))
$errors['members'][$staff_id] = __('Select a valid role');
if (!$staff_id || !Staff::lookup($staff_id))
if (!$staff_id || !($staff=Staff::lookup($staff_id)))
$errors['members'][$staff_id] = __('No such agent');

if ($staff->dept_id == $this->id) {

// If primary member then simply update the role.
if (($m = $this->members->findFirst(array(
'staff_id' => $staff_id))))
$m->role_id = $role_id;
continue;
}

$da = $this->extended->findFirst(array('staff_id' => $staff_id));
if (!isset($da)) {
$da = StaffDeptAccess::create(array(
$da = new StaffDeptAccess(array(
'staff_id' => $staff_id, 'role_id' => $role_id
));
$this->extended->add($da);
Expand All @@ -670,14 +711,24 @@ function updateAccess($access, &$errors) {
$da->role_id = $role_id;
}
$da->setAlerts($alerts);

}
if (!$errors && $dropped) {

if ($errors)
return false;

if ($dropped) {
$this->extended->saveAll();
$this->extended
->filter(array('staff_id__in' => array_keys($dropped)))
->delete();
$this->extended->reset();
}
return !$errors;

// Save any role change.
$this->members->saveAll();

return true;
}
}

Expand Down
34 changes: 24 additions & 10 deletions include/class.staff.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -782,16 +782,7 @@ static function getStaffMembers($criteria=array()) {
));
}

switch ($cfg->getAgentNameFormat()) {
case 'last':
case 'lastfirst':
case 'legal':
$members->order_by('lastname', 'firstname');
break;

default:
$members->order_by('firstname', 'lastname');
}
$members = self::nsort($members);

$users=array();
foreach ($members as $M) {
Expand All @@ -805,6 +796,23 @@ static function getAvailableStaffMembers() {
return self::getStaffMembers(array('available'=>true));
}

static function nsort(QuerySet $qs, $path='', $format=null) {
global $cfg;

$format = $format ?: $cfg->getAgentNameFormat();
switch ($format) {
case 'last':
case 'lastfirst':
case 'legal':
$qs->order_by("{$path}lastname", "{$path}firstname");
break;
default:
$qs->order_by("${path}firstname", "${path}lastname");
}

return $qs;
}

static function getIdByUsername($username) {
$row = static::objects()->filter(array('username' => $username))
->values_flat('staff_id')->first();
Expand Down Expand Up @@ -1456,6 +1464,12 @@ function getClean() {
list($clean['username'],) = preg_split('/[^\w.-]/u', $clean['email'], 2);
if (mb_strlen($clean['username']) < 3 || Staff::lookup($clean['username']))
$clean['username'] = mb_strtolower($clean['firstname']);


// Inherit default dept's role as primary role
$clean['assign_use_pri_role'] = true;

// Default permissions
$clean['perms'] = array(
User::PERM_CREATE,
User::PERM_EDIT,
Expand Down
61 changes: 40 additions & 21 deletions include/staff/department.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,14 +318,31 @@
<div id="access" class="hidden tab_content">
<table class="two-column table" width="100%">
<tbody>
<tr class="header">
<tr class="header" id="primary-members">
<td colspan="2">
<?php echo __('Department Members'); ?>
<div><small>
<?php echo __('Agents who are primary members of this department'); ?>
</small></div>
</td>
</tr>
<?php
if (!count($dept->members)) { ?>
<tr><td colspan=2><em><?php
echo __('Department does not have primary members'); ?>
</em> </td>
</tr>
<?php
} ?>
</tbody>
<tbody>
<tr class="header" id="extended-access-members">
<td colspan="2">
<div><small>
<?php echo __('Agents who have extended access to this department'); ?>
</small></div>
</td>
</tr>
<?php
$agents = Staff::getStaffMembers();
foreach ($dept->getMembers() as $member) {
Expand Down Expand Up @@ -387,26 +404,26 @@

<script type="text/javascript">
var addAccess = function(staffid, name, role, alerts, primary, error) {

if (!staffid) return;
var copy = $('#member_template').clone();

var target = (primary) ? 'extended-access-members' : 'add_extended_access';
copy.find('td:first').append(document.createTextNode(name));
if (primary) {
copy.find('td:first').append($('<span class="faded">').text(primary));
copy.find('td:last').empty();
copy.find('a.drop-membership').remove();
}
else {
copy.find('[data-name^=member_alerts]')
.attr('name', 'member_alerts['+staffid+']')
.prop('checked', alerts);
.prop('disabled', (primary))
.prop('checked', primary || alerts);
copy.find('[data-name^=member_role]')
.attr('name', 'member_role['+staffid+']')
.val(role || 0);
copy.find('[data-name=members\\[\\]]')
.attr('name', 'members[]')
.val(staffid);
}
copy.attr('id', '').show().insertBefore($('#add_extended_access'));

copy.attr('id', '').show().insertBefore($('#'+target));
copy.removeClass('hidden')
if (error)
$('<div class="error">').text(error).appendTo(copy.find('td:last'));
Expand All @@ -433,25 +450,27 @@

<?php
if ($dept) {
$members = $dept->members->all();
foreach ($dept->extended as $x) {
if (!$x->staff)
continue;
$members[] = new AnnotatedModel($x->staff, array(
'alerts' => $x->isAlertsEnabled(),
'role_id' => $x->role_id,
));
// Primary members
foreach ($dept->getPrimaryMembers() as $member) {
$primary = $member->dept_id == $info['id'];
echo sprintf('addAccess(%d, %s, %d, %d, %d, %s);',
$member->getId(),
JsonDataEncoder::encode((string) $member->getName()),
$member->role_id,
$member->get('alerts', 0),
($member->dept_id == $info['id']) ? 1 : 0,
JsonDataEncoder::encode($errors['members'][$member->staff_id])
);
}
usort($members, function($a, $b) { return strcmp($a->getName(), $b->getName()); });

foreach ($members as $member) {
$primary = $member->dept_id == $info['id'];
echo sprintf('addAccess(%d, %s, %d, %d, %s, %s);',
// Extended members.
foreach ($dept->getExtendedMembers() as $member) {
echo sprintf('addAccess(%d, %s, %d, %d, %d, %s);',
$member->getId(),
JsonDataEncoder::encode((string) $member->getName()),
$member->role_id,
$member->get('alerts', 0),
JsonDataEncoder::encode($primary ? ' — '.__('Primary') : ''),
0,
JsonDataEncoder::encode($errors['members'][$member->staff_id])
);
}
Expand Down
11 changes: 6 additions & 5 deletions include/staff/staff.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,13 @@ class="staff-username typeahead"
<tbody>
<tr class="header">
<th colspan="3">
<?php echo __('Primary Department and Role'); ?>
<span class="error">*</span>
<?php echo __('Access'); ?>
<div><small><?php echo __(
"Select the departments the agent is allowed to access and optionally select an effective role."
"Select the departments the agent is allowed to access and the corresponding effective role."
); ?>
</small></div>
</small></div><br>
<div><?php echo __('Primary Department'); ?> <span
class="error">*</span></div>
</th>
</tr>
<tr>
Expand Down Expand Up @@ -256,7 +257,7 @@ class="staff-username typeahead"
if ($staff->usePrimaryRoleOnAssignment())
echo 'checked="checked"';
?> />
<?php echo __('Fall back to primary role on assigned tickets'); ?>
<?php echo __('Fall back to primary role on assignments'); ?>
<i class="icon-question-sign help-tip"
href="#primary_role_on_assign"></i>
</label>
Expand Down

0 comments on commit c7e3dbd

Please sign in to comment.