aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Fix issues with Open/Closed translated too early.v2.2Matthew Somerville2017-09-15-6/+33
| | | | | | | | | | | | | | It was possible for _hardcoded_states to be reached with no locale selected (e.g. bin/update-all-reports), causing an error trying to translate Open/Closed. But translating those there wasn't correct, because that would then be cached and returned even if a different language was being used. Caching was ignored in testing, which did not help. We no longer translate the state names in their objects, only upon display at the point that we will know the locale. We can't simply return the translation of Open/Closed because there may be entries in the translation table as well.
* Include schema migration test.Matthew Somerville2017-09-14-0/+1
| | | | This was missed in 0998aef4.
* [Zurich] Fix Open311 querying unconfirmed reports.Matthew Somerville2017-09-14-1/+2
|
* Merge branch 'version-2.2'Matthew Somerville2017-09-14-18067/+24047
|\
| * Version 2.2.Matthew Somerville2017-09-13-18067/+24047
| | | | | | | | | | Couple of missed strings for translation, and prevent a couple of warnings in tests.
* | [Oxfordshire] Use local time for rdi_processed, not UTCDave Arter2017-09-13-5/+15
|/
* Disable email field for logged in people using JS.Matthew Somerville2017-09-13-4/+3
| | | | | They're logged in, it's only showing them as a confirmatory check, so it should not be editable.
* Merge branch 'issues/forcouncils/224-default-priority'Struan Donald2017-09-13-4/+72
|\
| * select default response priority in inspect panelStruan Donald2017-09-13-2/+20
| |
| * edit and display default response priority in adminStruan Donald2017-09-13-0/+36
| |
| * add is_default column to response_prioritiesStruan Donald2017-09-13-2/+16
| |
* | Add LWP panel to debug toolbar.Matthew Somerville2017-09-12-1/+23
| |
* | Merge branch '1836-slash-category-bug'Matthew Somerville2017-09-11-71/+11
|\ \
| * | Fix issue editing category with '/' in it.Matthew Somerville2017-09-11-35/+8
| | | | | | | | | | | | | | | | | | Simplify chaining of body/category admin URLs so that all categories are treated the same, with `/` or without, and the template will then always have its CSRF token.
| * | Fix bug if first page after restart is admin.Matthew Somerville2017-09-11-36/+3
| | | | | | | | | | | | | | | | | | | | | | | | If the first page looked at after server launch was an admin one, the User object was getting a different schema attached than the one used by everything else (so e.g. the cobrand was not then available to it, causing a crash on a body page). Using auto instead of begin prevents this from happening, as the setup_request auto always runs first.
* | | [Oxfordshire] Log when problems sent by RDI email.Dave Arter2017-09-11-5/+67
| |/ |/| | | | | | | | | | | | | The timestamp of when a problem was included in an RDI is shown on the problem’s inspector form. Also check back and include any inspected reports that for some reason haven't been instructed yet. Fixes mysociety/fixmystreetforcouncils#223.
* | [Oxfordshire] tests for response time messagesStruan Donald2017-09-11-0/+52
| |
* | changelog message for extra problem confirmation templatesStruan Donald2017-09-11-0/+1
| |
* | [Oxfordshire] Add response time message to problem confirm pageStruan Donald2017-09-11-0/+1
| |
* | [Oxfordshire] include response times in problem confirm emailsStruan Donald2017-09-11-0/+26
| |
* | allow extra details in problem-confirm emailsStruan Donald2017-09-11-0/+3
| |
* | [Oxfordshire] use single template for response time textStruan Donald2017-09-11-23/+16
| |
* | [Oxfordshire] include response time message on email sentStruan Donald2017-09-11-0/+9
| | | | | | | | | | add a _email_sent_extra template that includes a message about problem reponse times to be displayed on the email sent page.
* | partial to include extra message on email sent pageStruan Donald2017-09-11-0/+2
|/
* update changelog with details of new dashboard export fieldsStruan Donald2017-09-07-0/+2
|
* sort body dashboard CSV export by report confirmed timeStruan Donald2017-09-07-5/+5
| | | | | And update the tests to avoid a random failure caused by inconsistent ordering.
* Make sure pin ID is an integer.Matthew Somerville2017-09-07-2/+3
| | | | | | | | | | The JavaScript assumes it is, but due to a string comparison in DBIx::Class [1] when a has_many prefetch is in use (as it is on a /reports page when a shortlist-using staff user is logged in) all IDs bar the first were being given an internal string value and JSON encoding was outputting them as a string. [1] https://github.com/dbsrgits/dbix-class/blob/v0.08209/lib/DBIx/Class/ResultSet.pm#L1331
* Remove superflous commas from map HTML attributes.Matthew Somerville2017-09-06-2/+2
|
* Merge branch '866-alerts-ux-simpler'Matthew Somerville2017-09-06-78/+108
|\
| * Simpler alerts signup page.Zarino Zappia2017-09-06-78/+108
| | | | | | | | | | | | Alert options on the /alert/list page are now in an order that is easier to parse, with a slightly clearer message for users in two-tier locations, and a more prominent email subscription CTA.
* | [Borsetshire] Redirect users variously on login.Matthew Somerville2017-09-06-2/+20
| |
* | [fixmystreet.com] More data in fixture, wider areaMatthew Somerville2017-09-06-5/+11
| | | | | | | | Add some reports to the inspector's shortlist.
* | [Borsetshire] Use Oxfordshire pin images.Matthew Somerville2017-09-06-4/+8
|/
* Prevent race condition in root.t test.Matthew Somerville2017-09-06-1/+1
| | | | | | This test assumed /reports would load, which it wouldn't if run in parallel and the data hadn't been generated by reports.t. Test a different page instead.
* Merge branch 'issues/forcouncils/220-ward-column-in-export'Struan Donald2017-09-05-0/+45
|\
| * include easting/northing in dashboard CSV exportStruan Donald2017-09-04-1/+12
| | | | | | | | Fixes mysociety/fixmystreetforcouncils#221
| * include ward in dashboard csv exportStruan Donald2017-09-04-0/+34
| | | | | | | | | | | | | | Adds a Ward column to the council dashboard CSV export with the name of the ward. Fixes mysociety/fixmystreetforcouncils#220
* | Merge branch 'nicer-mapit-error'Matthew Somerville2017-09-05-0/+1
|\ \
| * | Upgrade commonlib to get nicer MapIt error messageMatthew Somerville2017-09-05-0/+1
| |/
* / [fixmystreet.com] Update FixMyStreet Pro links.Matthew Somerville2017-09-05-15/+15
|/
* Merge branch 'template-panel'Matthew Somerville2017-09-01-1/+47
|\
| * Add template debug panel.Matthew Somerville2017-09-01-1/+47
| | | | | | | | | | Use a small subclass of (our) P::M::D::Template to have better display of our template path names.
* | Superusers only have permissions available on the current cobrandDave Arter2017-09-01-0/+13
| |
* | Make current cobrand available on DB::SchemaDave Arter2017-09-01-0/+4
| |
* | Put comma in correct place in report lat/lonDave Arter2017-08-31-2/+2
| |
* | Merge branch 'move-report-states-to-database'Matthew Somerville2017-08-31-335/+760
|\ \
| * | Hide things needing fixed state if no fixed state.Matthew Somerville2017-08-31-2/+10
| | | | | | | | | | | | | | | Front page stats, update form question, list filtering, plus do not send any questionnaires.
| * | Update form asks for reopen of all closed states.Matthew Somerville2017-08-31-25/+25
| | |
| * | Admin interface for editing report states.Matthew Somerville2017-08-31-0/+246
| | |
| * | Remove hardcoded states from templates.Matthew Somerville2017-08-31-204/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State display names are now got from the database wherever they are displayed, including admin dropdowns, list filters, and update meta statements. This also covers the open/closed/fixed 'groups'. This also fixes a bug whereby if e.g. an update has problem_state investigating, the next update has no problem_state, and the last update has investigating again, it was previously showing a state change to investigating on that third update.