Skip to content
Snippets Groups Projects
Commit fac89394 authored by Peter Rotich's avatar Peter Rotich
Browse files

Allow manager to be set even when a department has no members

This is necessary to allow for creative department based access control and
alerts.
parent 12da45f9
No related branches found
No related tags found
No related merge requests found
...@@ -119,8 +119,6 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); ...@@ -119,8 +119,6 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
&nbsp;<span class="error">*&nbsp;<?php echo $errors['sla_id']; ?></span> &nbsp;<span class="error">*&nbsp;<?php echo $errors['sla_id']; ?></span>
</td> </td>
</tr> </tr>
<?php
if($dept && $dept->getNumUsers()){ ?>
<tr> <tr>
<td width="180" class="required"> <td width="180" class="required">
Manager: Manager:
...@@ -128,12 +126,11 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); ...@@ -128,12 +126,11 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<td> <td>
<select name="manager_id"> <select name="manager_id">
<option value="0">&mdash; None &mdash;</option> <option value="0">&mdash; None &mdash;</option>
<option value="0" disabled="disabled">Select Department Manager (Optional)</option>
<?php <?php
$sql='SELECT staff_id,CONCAT_WS(", ",lastname, firstname) as name ' $sql='SELECT staff_id,CONCAT_WS(", ",lastname, firstname) as name '
.' FROM '.STAFF_TABLE.' staff ' .' FROM '.STAFF_TABLE.' staff '
.' ORDER by name'; .' ORDER by name';
if(($res=db_query($sql)) && db_num_rows($res)){ if(($res=db_query($sql)) && db_num_rows($res)) {
while(list($id,$name)=db_fetch_row($res)){ while(list($id,$name)=db_fetch_row($res)){
$selected=($info['manager_id'] && $id==$info['manager_id'])?'selected="selected"':''; $selected=($info['manager_id'] && $id==$info['manager_id'])?'selected="selected"':'';
echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name); echo sprintf('<option value="%d" %s>%s</option>',$id,$selected,$name);
...@@ -144,9 +141,6 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); ...@@ -144,9 +141,6 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
&nbsp;<span class="error">&nbsp;<?php echo $errors['manager_id']; ?></span> &nbsp;<span class="error">&nbsp;<?php echo $errors['manager_id']; ?></span>
</td> </td>
</tr> </tr>
<?php
} ?>
<tr> <tr>
<td width="180"> <td width="180">
Group Membership: Group Membership:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment