Skip to content
Snippets Groups Projects
Commit ff0a3ee9 authored by Jared Hancock's avatar Jared Hancock
Browse files

role: Forbid removing agent primary role

parent 05a5a771
No related branches found
No related tags found
No related merge requests found
...@@ -24,6 +24,9 @@ class RoleModel extends VerySimpleModel { ...@@ -24,6 +24,9 @@ class RoleModel extends VerySimpleModel {
'list' => true, 'list' => true,
'reverse' => 'Group.role', 'reverse' => 'Group.role',
), ),
'agents' => array(
'reverse' => 'Staff.role',
),
), ),
); );
...@@ -67,7 +70,7 @@ class RoleModel extends VerySimpleModel { ...@@ -67,7 +70,7 @@ class RoleModel extends VerySimpleModel {
} }
function isDeleteable() { function isDeleteable() {
return ($this->groups->count() == 0); return $this->groups->count() + $this->agents->count() == 0;
} }
} }
......
...@@ -75,7 +75,7 @@ $roles = Role::getActiveRoles(); ...@@ -75,7 +75,7 @@ $roles = Role::getActiveRoles();
</td> </td>
<td> <td>
<select name="role_id"> <select name="role_id">
<option value="0">Select One</option> <option value="0"><?php echo __('Select One'); ?></option>
<?php <?php
foreach ($roles as $id => $role) { foreach ($roles as $id => $role) {
$sel = ($info['role_id'] == $id) ? 'selected="selected"' : ''; $sel = ($info['role_id'] == $id) ? 'selected="selected"' : '';
...@@ -140,7 +140,9 @@ $roles = Role::getActiveRoles(); ...@@ -140,7 +140,9 @@ $roles = Role::getActiveRoles();
?> ?>
<select name="<?php echo $_name; ?>"> <select name="<?php echo $_name; ?>">
<option value="0">&mdash; <?php <option value="0">&mdash; <?php
echo __('Group Default'); ?> &mdash;</option> echo __('Group Default'); ?><?php
if (isset($group)) echo ' ('.$group->role->getName().')';
?> &mdash;</option>
<?php <?php
foreach ($roles as $rid => $role) { foreach ($roles as $rid => $role) {
$sel = ''; $sel = '';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment