Skip to content
Snippets Groups Projects
Commit 833671d6 authored by JediKev's avatar JediKev
Browse files

issue: Email Default Dept

This addresses an issue where configuring a System Email to have a
Department and then editing/saving changes on the configured Department will
change the System Email's Department back to the the default Department.
This was due to a un-needed Department Status check introduced with commit
`1d361b51`. This also updates all instances of Dept Status comparison to be
case insensitive and non-translated.
parent 149f5735
No related branches found
No related tags found
No related merge requests found
...@@ -99,9 +99,9 @@ $info = Format::htmlchars(($errors && $_POST) ? $_POST : $info); ...@@ -99,9 +99,9 @@ $info = Format::htmlchars(($errors && $_POST) ? $_POST : $info);
</td> </td>
<td> <td>
<select name="status"> <select name="status">
<option value="active"<?php echo ($info['status'] == __('Active'))?'selected="selected"':'';?>><?php echo __('Active'); ?></option> <option value="active"<?php echo (!strcasecmp($info['status'], 'active'))?'selected="selected"':'';?>><?php echo __('Active'); ?></option>
<option value="disabled"<?php echo ($info['status'] == __('Disabled'))?'selected="selected"':'';?>><?php echo __('Disabled'); ?></option> <option value="disabled"<?php echo (!strcasecmp($info['status'], 'disabled'))?'selected="selected"':'';?>><?php echo __('Disabled'); ?></option>
<option value="archived"<?php echo ($info['status'] == __('Archived'))?'selected="selected"':'';?>><?php echo __('Archived'); ?></option> <option value="archived"<?php echo (!strcasecmp($info['status'], 'archived'))?'selected="selected"':'';?>><?php echo __('Archived'); ?></option>
</select> </select>
&nbsp;<span class="error">&nbsp;</span> <i class="help-tip icon-question-sign" href="#status"></i> &nbsp;<span class="error">&nbsp;</span> <i class="help-tip icon-question-sign" href="#status"></i>
</td> </td>
......
...@@ -143,7 +143,7 @@ $showing = $pageNav->showing().' '._N('department', 'departments', $count); ...@@ -143,7 +143,7 @@ $showing = $pageNav->showing().' '._N('department', 'departments', $count);
echo Dept::getNameById($id); ?></a>&nbsp;<?php echo $default; ?> echo Dept::getNameById($id); ?></a>&nbsp;<?php echo $default; ?>
</td> </td>
<td><?php <td><?php
if($dept->getStatus() == __('Active')) if(!strcasecmp($dept->getStatus(), 'Active'))
echo $dept->getStatus(); echo $dept->getStatus();
else else
echo '<b>'.$dept->getStatus(); echo '<b>'.$dept->getStatus();
......
...@@ -25,9 +25,6 @@ if($_REQUEST['id'] && !($dept=Dept::lookup($_REQUEST['id']))) ...@@ -25,9 +25,6 @@ if($_REQUEST['id'] && !($dept=Dept::lookup($_REQUEST['id'])))
if(!$dept){ if(!$dept){
$errors['err']=sprintf(__('%s: Unknown or invalid'), __('department')); $errors['err']=sprintf(__('%s: Unknown or invalid'), __('department'));
}elseif($dept->update($_POST,$errors)){ }elseif($dept->update($_POST,$errors)){
if ($_POST["status"] != __('Active'))
Dept::clearInactiveDept($dept->getId());
$msg=sprintf(__('Successfully updated %s.'), $msg=sprintf(__('Successfully updated %s.'),
__('this department')); __('this department'));
}elseif(!$errors['err']){ }elseif(!$errors['err']){
...@@ -133,8 +130,6 @@ if($_REQUEST['id'] && !($dept=Dept::lookup($_REQUEST['id']))) ...@@ -133,8 +130,6 @@ if($_REQUEST['id'] && !($dept=Dept::lookup($_REQUEST['id'])))
FilterAction::setFilterFlag($filter_actions, 'dept', true); FilterAction::setFilterFlag($filter_actions, 'dept', true);
if($d->save()) { if($d->save()) {
$num++; $num++;
//set dept_id to default for topics/emails using disabled dept
Dept::clearInactiveDept($d->getId());
} }
} }
if ($num > 0) { if ($num > 0) {
......
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