diff options
| author | Struan Donald <struan@exo.org.uk> | 2017-09-13 09:52:12 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2017-09-13 09:52:12 +0100 |
| commit | a181c520986498ab5a898ad3c21c04affa215378 (patch) | |
| tree | 9630a7b97fd57081f9175741cdeeeb8046d39d32 /templates | |
| parent | 81744445eedc8686827cfc119b51ae8ec704a963 (diff) | |
| parent | e2225f14211e061330223b9f752b7924610bc0f9 (diff) | |
Merge branch 'issues/forcouncils/224-default-priority'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/base/admin/responsepriorities/edit.html | 12 | ||||
| -rw-r--r-- | templates/web/base/admin/responsepriorities/list.html | 2 | ||||
| -rw-r--r-- | templates/web/base/report/_inspect.html | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/templates/web/base/admin/responsepriorities/edit.html b/templates/web/base/admin/responsepriorities/edit.html index 07d6906ba..608f19e74 100644 --- a/templates/web/base/admin/responsepriorities/edit.html +++ b/templates/web/base/admin/responsepriorities/edit.html @@ -30,6 +30,18 @@ <div class="admin-hint"> <p> + [% loc('Select if this is the default priority') %] + </p> + </div> + <p> + <label> + <input type="checkbox" name="is_default" is="is_deleted" value="1"[% ' checked' IF rp.is_default %]> + [% loc('Default priority') %] + </label> + </p> + + <div class="admin-hint"> + <p> [% loc('If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories.') %] </p> </div> diff --git a/templates/web/base/admin/responsepriorities/list.html b/templates/web/base/admin/responsepriorities/list.html index 80d4e2cee..eedaccfdb 100644 --- a/templates/web/base/admin/responsepriorities/list.html +++ b/templates/web/base/admin/responsepriorities/list.html @@ -6,6 +6,7 @@ <th> [% loc('Name') %] </th> <th> [% loc('Description') %] </th> <th> [% loc('Categories') %] </th> + <th> [% loc('Default') %] </th> <th> </th> </tr> </thead> @@ -23,6 +24,7 @@ [% END %] [% END %] </td> + <td> [% IF p.is_default %]X[% END %]</td> <td> <a href="[% c.uri_for('', body.id, p.id) %]" class="btn">[% loc('Edit') %]</a> </td> </tr> [% END %] diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html index 561be30d1..436c89e4a 100644 --- a/templates/web/base/report/_inspect.html +++ b/templates/web/base/report/_inspect.html @@ -122,9 +122,9 @@ <p> <label for="problem_priority">[% loc('Priority') %]</label> <select name="priority" id="problem_priority" class="form-control"> - <option value="" [% 'selected' UNLESS problem.response_priority_id %]>-</option> + <option value="" [% 'selected' UNLESS problem.response_priority_id OR has_default_priority %]>-</option> [% FOREACH priority IN problem.response_priorities %] - <option value="[% priority.id %]" [% 'selected' IF problem.response_priority_id == priority.id %] [% 'disabled' IF priority.deleted %]>[% priority.name | html %]</option> + <option value="[% priority.id %]" [% 'selected' IF ( problem.response_priority_id == priority.id ) OR priority.is_default %][% 'disabled' IF priority.deleted %]>[% priority.name | html %]</option> [% END %] </select> </p> |