aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/App/Controller
Commit message (Collapse)AuthorAgeLines
* Merge branch 'admin-user-logged-preference'Matthew Somerville2020-01-31-2/+2
|\
| * Default logging to logged in user.Matthew Somerville2020-01-31-2/+2
| | | | | | | | | | | | | | | | | | Historically, the FixMyStreet admin was accessed via HTTP Basic Auth and a secure proxy, so the auth user was used for logging purposes. Nowadays all admin use is by FixMyStreet user, and any Basic Auth is used for the purpose of hiding staging sites from bots. This configuration means that on those staging sites, all admin is logged by the one staging user, not the actual user, so let's swap that round.
* | Display inline map for duplicate suggestions on mobileDave Arter2020-01-31-2/+8
|/ | | | For #2668.
* Enable category groups on map filter dropdown.Dave Arter2020-01-30-1/+4
| | | | Includes an updated version of jquery-multi-select.
* Merge branch 'bodies-list-cats-by-group'Matthew Somerville2020-01-29-0/+2
|\
| * List categories in body admin by group.Matthew Somerville2020-01-28-0/+2
| |
* | Allow multiple question to disable the new report formChris Mytton2020-01-28-11/+16
|/ | | | | | | | | | | | | This changes the existing logic to account for the fact that multiple questions might have the disable form checkbox ticked for one of their options. At the moment this just displays one of the messages at a time, with the first one taking priority. So if you have a "Is this an emergency" question and a "Is this on private land" question which both disable the form, and the user has selected "Yes" to both, then only the message for the first question is displayed. This can potentially be improved in the future, but seemed out of scope for this change.
* Add per report OpenGraph imagesGraeme Porteous2020-01-27-1/+1
| | | | | | | | | | | | | Includes a bit of refactoring of PhotoSet::get_image_data to make it easier to call subsequent methods on the photo object. We then do this to get the width and height. Also adds width/height attributes to FixMyStreet::ImageMagick Attributes are updated every time the image is transformed and before the as_blob data, which also undefs the image, is returned so it always present for subsequent calls. Fixes #2394.
* Merge branch 'same-cat-different-groups'Matthew Somerville2020-01-21-0/+2
|\
| * Filter contacts before constructing options.Matthew Somerville2020-01-21-0/+2
| | | | | | | | | | | | | | If we wait until after to filter the contacts and the constructed options, then we can end up in the situation where e.g. we've filtered out all the TfL contacts but the category option is still the TfL one (with its associated group).
* | Fix possible heatmap viewing when not logged in.Matthew Somerville2020-01-21-8/+15
|/
* Skip admin contact email validation check if address hasn’t changedDave Arter2020-01-20-1/+2
| | | | | | | | | | | | | Some contacts (e.g. TfL) don’t have a valid email address but aren’t Open311 categories - the email destination is managed via the borough_email_addresses feature. This prevents any changes to the contact being made via the admin due to the email validation error message. This commit updates the logic to only check that the email address is valid if it’s been changed from the existing value (which may be blank if a it’s a new contact). Fixes https://github.com/mysociety/fixmystreet-freshdesk/issues/108
* Merge branch 'dashboard-optgroup'Matthew Somerville2020-01-17-0/+1
|\
| * Include category groups in dashboard filter.Matthew Somerville2020-01-16-0/+1
| |
* | [TfL] Include non-open reports in dupe suggestionsMatthew Somerville2020-01-16-2/+4
|/
* [TfL] Hide ‘please ring’ categories in admin.Matthew Somerville2020-01-10-0/+1
| | | | | These categories display a ‘please ring’ message and so have nowhere to be resent if selected.
* Scrub admin description fields.Matthew Somerville2020-01-09-2/+5
|
* Merge branch 'staff-sign-up-other-user-for-alert'Matthew Somerville2020-01-09-28/+19
|\
| * Allow staff users to sign others up for alerts.Matthew Somerville2020-01-08-4/+12
| |
| * Check provided report ID for update alert signup.Matthew Somerville2020-01-08-24/+7
| | | | | | | | Remove some unused code.
* | Merge branch 'issues/commercial/1287-as-another-user-only-name'Matthew Somerville2020-01-09-3/+8
|\ \
| * | Allow report as another user with only name.Matthew Somerville2020-01-08-3/+8
| |/
* | Merge branch 'bexley-resend-okay'Matthew Somerville2020-01-09-2/+2
|\ \
| * | [Bexley] Resend on nearly all category changes.Matthew Somerville2020-01-08-1/+1
| | | | | | | | | | | | | | | The only exception is when the category change is between two categories in the same Symology database, in which case we do not want to resend.
| * | [Bexley] Allow resending, still hide resend buttonMatthew Somerville2020-01-08-1/+1
| |/
* / Hide ‘provide extra information’ preamble when no visible fields are presentDave Arter2020-01-07-0/+13
|/ | | | | | | | | For categories that use the extra metadata fields to just show a notice message to the user, the ‘help the council fix the problem by providing extra information’ text was a bit out of place. This commit hides it unless there are actual UI elements also included in the markup. Fixes #2811.
* Clear any categories from user when unsetting from_bodyDave Arter2020-01-06-0/+2
| | | | This was most likely the cause of #2815.
* Check area IDs non-empty in inspector redirect.Matthew Somerville2019-12-17-3/+3
|
* Store staff user when staff make anonymous report.Dave Arter2019-12-17-0/+7
| | | | | | If a staff user uses the anonymous button, it does not otherwise record which staff user did that; using Report As would store their user as the report's user.
* Do not hard code site name in database fixture.Matthew Somerville2019-12-10-2/+2
| | | | This also lets it be cobrand specific.
* [UK] Add SQL problem restrictions for RSS feeds.Matthew Somerville2019-12-09-2/+5
|
* [fixmystreet.com] Limit TfL cobrand report displayMatthew Somerville2019-12-09-1/+6
| | | | | | | | | On fixmystreet.com, you cannot view reports made on the TfL cobrand, apart from on reporting seeing pins labelled with the report's category, linking through to the TfL cobrand. Output the pin's base URL if different from normal, so e.g. app can link appropriately.
* [TfL] Resend report upon category change.Matthew Somerville2019-12-09-0/+4
|
* [TfL] Send email to shortlisted user upon update.Matthew Somerville2019-12-09-0/+2
|
* Allow cobrands to skip 2FA requirement.Matthew Somerville2019-12-09-4/+7
|
* Add cobrand hook for overriding areas on /reports wardsDave Arter2019-12-09-3/+1
|
* Do not include disable-form message in extras listMatthew Somerville2019-12-09-5/+11
| | | | | | | | | If the disable form message is being shown, the normal list is hidden, so there's no point in outputting the same message there. (This also helps with a TfL issue where we want to show a disable form on a red route, but not elsewhere, and this means it won't show the disable form message as a normal extra question.)
* Include areas in query param for inspector post-login redirect to all reportsDave Arter2019-12-09-18/+5
| | | | | Performs a proper redirect instead of detaching to /my/inspector_redirect so any request params from sign-in (e.g. password!) aren't carried through.
* Pre-filter ‘all reports’ by area for inspectorsDave Arter2019-12-09-0/+28
|
* Group categories on response template edit page, if cobrand allowsDave Arter2019-12-09-0/+2
|
* Group categories on user edit page, if cobrand has grouping enabledDave Arter2019-12-09-16/+30
|
* [UK Councils] Ensure response templates owned by other bodies aren’t visibleDave Arter2019-12-09-3/+9
|
* Switch to default-escaped in email templates.Matthew Somerville2019-12-09-1/+9
| | | | | We add a way to process a template with no auto-escaping, that can be used for the text parts of emails, and mark various HTML output as safe.
* Switch to default-escaped in templates.Matthew Somerville2019-12-09-4/+8
| | | | | | | This means any variable used in a template is automatically HTML-escaped, unless it is marked as safe either in code by using a SafeString, or in the template with the `mark_safe` function or the `safe` filter.
* add bodies_id to stash for around and report/newStruan Donald2019-11-26-0/+2
| | | | | | | | This resolved the problem of checking user body permissions on both around and report/new by adding a variable to stash specifically for this purpose. Previously staff users could not see the mark private tick if the report form was loaded via javascript from the around page as there was no bodies variable in the stash.
* Switch to internal QR code generator.Matthew Somerville2019-11-23-4/+4
|
* Rotate session ID after successful login.Matthew Somerville2019-11-22-3/+5
|
* Remove cached photos before updating db field.Matthew Somerville2019-11-18-2/+2
| | | | | If the photo field is updated first, then the cache removal doesn't think there are any photos to remove.
* Merge branch 'issues/freshdesk/98-staff-ignore-emergency-message'Struan Donald2019-11-15-0/+4
|\
| * allow staff to submit in disabled categoriesStruan Donald2019-11-15-0/+4
| | | | | | | | | | | | | | If a user belongs to a body override the disabled form check upon submission as mostly staff users can submit in those categories. Fixes mysociety/fixmystreet-freshdesk#98