diff --git a/include/class.ticket.php b/include/class.ticket.php index 3b4920f71e501dc384c48fbc108ce369225e171a..00d08bd08691fd36e689f1dd068f4a94dac57a52 100644 --- a/include/class.ticket.php +++ b/include/class.ticket.php @@ -298,7 +298,8 @@ implements RestrictedAccess, Threadable { function isReopenable() { return ($this->getStatus()->isReopenable() - && $this->getDept()->allowsReopen()); + && $this->getDept()->allowsReopen() + && $this->getTopic()->allowsReopen()); } function isClosed() { diff --git a/include/i18n/en_US/help/tips/manage.helptopic.yaml b/include/i18n/en_US/help/tips/manage.helptopic.yaml index 0297f1ceeb93f418b112cdfecbc4213f1ae2cbeb..e13ae5eafbde807b69adbb95af3be74b95b587d2 100644 --- a/include/i18n/en_US/help/tips/manage.helptopic.yaml +++ b/include/i18n/en_US/help/tips/manage.helptopic.yaml @@ -27,7 +27,7 @@ topic: status: title: Status content: > - If disabled, this <span class="doc-desc-title">Help Topic</span> + If disabled or archived, this <span class="doc-desc-title">Help Topic</span> will not be available. type: diff --git a/include/i18n/en_US/help/tips/staff.department.yaml b/include/i18n/en_US/help/tips/staff.department.yaml index 015c9b1224c3a6a8647e633e3dcb14dd3e2b6f82..96ff9e16bd762b939b15840b98f3e733c7a205f1 100644 --- a/include/i18n/en_US/help/tips/staff.department.yaml +++ b/include/i18n/en_US/help/tips/staff.department.yaml @@ -13,6 +13,11 @@ # must match the HTML #ids put into the page template. # --- +status: + title: Status + content: > + If disabled or archived, this <span class="doc-desc-title">Department</span> + will not be available. type: title: Type content: > diff --git a/include/staff/department.inc.php b/include/staff/department.inc.php index 19364945bd830c8878276526ac5be0c4391e38cf..ed029742259a016aa06673b0b1392aaf90776bcd 100644 --- a/include/staff/department.inc.php +++ b/include/staff/department.inc.php @@ -98,9 +98,12 @@ $info = Format::htmlchars(($errors && $_POST) ? $_POST : $info); <?php echo __('Status');?>: </td> <td> - <input type="radio" name="status" value="Active" <?php echo $info['status'] == 'Active'?'checked="checked"':''; ?>> <?php echo __('Active'); ?> - <input type="radio" name="status" value="Disabled" <?php echo $info['status'] == 'Disabled'?'checked="checked"':''; ?>> <?php echo __('Disabled'); ?> - <input type="radio" name="status" value="Archived" <?php echo $info['status'] == 'Archived'?'checked="checked"':''; ?>> <?php echo __('Archived'); ?> + <select name="status"> + <option value="Active"<?php echo ($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="Archived"<?php echo ($info['status'] == __('Archived'))?'selected="selected"':'';?>><?php echo __('Archived'); ?></option> + </select> + <span class="error"> </span> <i class="help-tip icon-question-sign" href="#status"></i> </td> </tr> <tr> diff --git a/include/staff/helptopic.inc.php b/include/staff/helptopic.inc.php index 15a7cb2177a352ce240509bdf3c3de6adcb38e76..b6783666998c52af37d30c4e3ed401c272ff65f0 100644 --- a/include/staff/helptopic.inc.php +++ b/include/staff/helptopic.inc.php @@ -60,9 +60,11 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); <?php echo __('Status');?>: </td> <td> - <input type="radio" name="status" value="Active" <?php echo $info['status'] == 'Active'?'checked="checked"':''; ?>> <?php echo __('Active'); ?> - <input type="radio" name="status" value="Disabled" <?php echo $info['status'] == 'Disabled'?'checked="checked"':''; ?>> <?php echo __('Disabled'); ?> - <input type="radio" name="status" value="Archived" <?php echo $info['status'] == 'Archived'?'checked="checked"':''; ?>> <?php echo __('Archived'); ?> + <select name="status"> + <option value="Active"<?php echo ($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="Archived"<?php echo ($info['status'] == __('Archived'))?'selected="selected"':'';?>><?php echo __('Archived'); ?></option> + </select> <span class="error">* </span> <i class="help-tip icon-question-sign" href="#status"></i> </td> </tr>