Merge branch 'new_statuses'

5 files changed, 74 insertions, 2 deletions

diff --git a/templates/web/default/admin/list_updates.html b/templates/web/default/admin/list_updates.html
index 92f41f348..4f27b9595 100644
--- a/templates/web/default/admin/list_updates.html
+++ b/templates/web/default/admin/list_updates.html
@@ -8,6 +8,8 @@
         <th>[% loc('Email') %]</th>
         <th>[% loc('Created') %]</th>
         <th>[% loc('Anonymous') %]</th>
+        <th>[% loc('Owner') %]</th>
+        <th>[% loc('Council') %]</th>
         <th>[% loc('Cobrand') %]</th>
         <th>[% loc('Text') %]</th>
         <th>*</th>
@@ -26,6 +28,8 @@
         <td>[% update.user.email | html %]</td> 
         <td>[% PROCESS format_time time=update.created %]</td> 
         <td>[% IF update.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> 
+        <td>[% IF update.user.id == update.problem.user_id %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
+        <td>[% IF update.user.belongs_to_council( update.problem.council ) %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
         <td>[% update.cobrand %]<br>[% update.cobrand_data | html %]</td> 
         <td>[% update.text | html %]</td> 
         <td><a href="[% c.uri_for( 'update_edit', update.id ) %]">[% loc('Edit') %]</a></td>
diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html
index 69d5d0b11..470ad311a 100644
--- a/templates/web/default/admin/report_edit.html
+++ b/templates/web/default/admin/report_edit.html
@@ -19,7 +19,10 @@
 <option [% 'selected ' IF !problem.anonymous %]value="0">[% loc('No') %]</option>
 </select></li>
 <li><label for="state">[% loc('State:') %]</label> <select name="state"  id="state">
-    [% FOREACH state IN [ ['confirmed', loc('Open')], ['fixed', loc('Fixed')], ['hidden', loc('Hidden')], ['partial', loc('Partial')],['unconfirmed',loc('Unconfirmed')] ] %]
+    [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
+    loc('Investigating')], ['planned', loc('Planned')], ['in progress',
+    loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')], ['fixed - user',
+    loc('Fixed - User')], ['fixed - council', loc('Fixed - Council')], ['hidden', loc('Hidden')], ['partial', loc('Partial')],['unconfirmed',loc('Unconfirmed')] ] %]
         <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option>
     [% END %]
 </select></li>
diff --git a/templates/web/default/admin/search_users.html b/templates/web/default/admin/search_users.html
new file mode 100644
index 000000000..43fdebf2b
--- /dev/null
+++ b/templates/web/default/admin/search_users.html
@@ -0,0 +1,29 @@
+[% INCLUDE 'admin/header.html' title=loc('Search Users') %]
+[% PROCESS 'admin/report_blocks.html' %]
+
+<form method="get" action="[% c.uri_for('search_users') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+    <label for="search">[% loc('Search:') %]</label> <input type="text" name="search"  size="30" id="search">
+</form>
+
+
+[% IF searched %]
+<table cellspacing="0" cellpadding="2" border="1">
+    <tr>
+        <th>[% loc('Name') %]</th>
+        <th>[% loc('Email') %]</th>
+        <th>[% loc('Council') %]</th>
+        <th>*</th>
+    </tr>
+[%- FOREACH user IN users %]
+    <tr>
+        <td>[% PROCESS value_or_nbsp value=user.name %]</td> 
+        <td>[% PROCESS value_or_nbsp value=user.email %]</td> 
+        <td>[% PROCESS value_or_nbsp value=user.from_council %]</td> 
+        <td><a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a></td>
+    </tr>
+[%- END -%]
+</table>
+
+[% END %]
+
+[% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/default/admin/update_edit.html b/templates/web/default/admin/update_edit.html
index d4ac1b440..e1783fd7c 100644
--- a/templates/web/default/admin/update_edit.html
+++ b/templates/web/default/admin/update_edit.html
@@ -21,7 +21,22 @@
     [% END %]
 </select></li>
 <li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% update.name | html %]'></li>
-<li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% update.user.email | html %]'> [% PROCESS abuse_button %] [% PROCESS flag_button user=update.user %]</li>
+<li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% update.user.email | html %]'>
+[%- IF update.user.from_council && update.user.from_council == update.problem.council %]
+[% ' (' _ tprintf(loc('user is from same council as problem - %d'), update.user.from_council ) _')' %]
+[% END -%]
+[%- IF update.user.id == update.problem.user.id %]
+[% ' (' _ loc('user is problem owner') _')' %]
+[% END -%]
+</li>
+[% IF update.problem_state %]
+<li>[% tprintf(loc('Update changed problem state to %s'), update.problem_state) %]</li>
+[% ELSIF update.mark_fixed %]
+<li>[% loc('Update marked problem as fixed') %]</li>
+[% ELSIF update.user.id == update.problem.user.id && update.mark_open %]
+<li>[% loc('Update reopened problem') %]</li>
+[% END %]
+[% PROCESS abuse_button %] [% PROCESS flag_button user=update.user %]</li>
 <li>[% loc('Cobrand:') %] [% update.cobrand %]</li>
 <li>[% loc('Cobrand data:') %] [% update.cobrand_data %]</li>
 <li>[% loc('Created:') %] [% PROCESS format_time time=update.created %]</li>
diff --git a/templates/web/default/admin/user_edit.html b/templates/web/default/admin/user_edit.html
new file mode 100644
index 000000000..7db8f5c63
--- /dev/null
+++ b/templates/web/default/admin/user_edit.html
@@ -0,0 +1,21 @@
+[% INCLUDE 'admin/header.html' title=tprintf(loc('Editing user %d'), user.id ) -%]
+[% PROCESS 'admin/report_blocks.html' %]
+
+[% status_message %]
+
+<form method="post" action="[% c.uri_for( 'user_edit', user.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+    <input type="hidden" name="token" value="[% token %]" >
+    <input type="hidden" name="submit" value="1" >
+<ul>
+<li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% user.name | html %]'></li>
+<li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% user.email | html %]'></li>
+<li>[% loc('Council:') %] <select id='council' name='council'>
+    <option value=''>[% loc('No council') %]</option>
+[% FOR council IN council_ids %]
+    <option value="[% council %]"[% ' selected' IF council == user.from_council %]>[% council_details.$council.name %]</option>
+[% END %]
+</select>
+</ul>
+<input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" ></form>
+
+[% INCLUDE 'admin/footer.html' %]