| Commit message (Collapse) | Author | Age | Lines |
... | |
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
|/
|
|
|
|
|
|
|
|
| |
The mobile app is looking at the old extra.datatype_description location
rather than the new disable_form location for per-question disabling (it
does look there for all-category disabling). So we need to make sure the
JSON includes the message in the place where it will be looking.
Note if an extra data question has two answers that disable the form and
they have different messaging, the app will only take one of them.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Split load_and_group_problems in two, split out category list/map setup,
and factor out sort stash setting. No actual changes.
|
| |
|
| |
|
| |
|
|
|
|
| |
Allows limiting display, moderation and photos of comments.
|
|\ \
| | |
| | |
| | | |
'2469-fancy-admin-category-form' and 'fix-missing-body-message-flash'
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As the around page includes a copy of the reporting form (when JS is
available), it runs the same templating code that the reporting form
does. Part of this code compares the bodies and bodies_to_list stash
variables to see whether it needs to display a message about missing
body information. Previously both variables were empty on the around
page itself, so no message would be shown, but a new bodies variable
was added in 4668f81a, which meant the message was now output in the
HTML and shown briefly when the map was clicked - until updated by a
server response). Rename the variable so that this no longer occurs.
|
| |/
|/|
| |
| | |
This saves e.g. a call to Gaze on successful report submission.
|
|/
|
|
|
|
|
|
|
| |
* Much simplified display of metadata field options.
* Fields can now be dragged into the desired order.
* Drop-down question form disabling can now have
a different message per option.
Co-Authored-By: Matthew Somerville <matthew@mysociety.org>
|
|\ |
|
| | |
|
|\ \ |
|
| | | |
|
| |/ |
|
| |
| |
| |
| |
| | |
This is only used for audit purposes on FixMyStreet and not required in
Confirm.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Only display non triage categories on this because getting the category
expansion to work if we use the triage categories isn't in place and may
not be. This is because when we get the list of reports using
/around/ajax there's no way to know which body it is for so we don't
know how to expand a triage category to the list of 'child' categories.
So, just display the non triage ones for now.
|
| |
| |
| |
| |
| |
| | |
add a check into the Alerts script to skip comments that have
`triage_report` set in extra. Otherwise we send these our in new_updates
alerts.
|
| |
| |
| |
| |
| |
| |
| |
| | |
If it's a standard user only display the Triage category list but if one
of these is selected then look up all the categories in that group and
use those to select the reports to display.
It it's a staff user then ignore the Triage categories.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add in some cobrand handlers to make sure
a) the appropriate categories are show to staff/non staff users on the
around and reports pages
b) that those categories are correctly expanded to the child
categories when using the category filter to search reports
This is because non staff users should only be shown Isle of Wight
categories with a send_method of 'Triage', however once those reports
are triaged the post triage categories need to be included in any
filtering
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On reports with a state of `for_triage` override the `_inspect.html`
template to display one which allows only allows the user to change the
category from one with a 'Triage' send_method to a non Triage
send_method.
When saved this records a comment with the original category and the
category it was triaged to. This is hidden from the site as it's only
used for audit purposes and sending over Open311.
This assumes that the triage categories have the same names as the
groups of the confirm categories. It uses this to select the first
confirm category in the group corresponding to the triage category.
This also makes the sidebar geolocation onclick handler check for the
presence of the button, as the triage inspect form does not have it.
|
|/ |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When an open311 category has multiple groups it puts them in the groups
element using CSV escaping. This means that group names can sometimes
feature double quotes. If we send these to the front end then putting
them into the optgroup name attribute breaks the HTML as if the group
name is in the database as `"group name"` you end up with
<optgroup name="" group="" name="">
instead of
<optgroup name="group name">
Hence, stripping the double quotes.
|
|
|
|
|
|
|
| |
The request cobrand is set on the schema during the app's
setup_request(), which is called by the root auto action.
So anything in a controller's begin action will access an
incorrect cobrand (if one has already been set).
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
This improves the reporting journey to only ask for category,
and then category extra questions if appropriate, first, so that
if the choice would lead to the form being disabled, this can
be shown immediately.
|
| | |
|
|\ \
| |/
|/| |
|
| |
| |
| |
| |
| |
| |
| |
| | |
The extras may be a confusing stopper message that only applies to the
'main' body, or it may be extra questions that are now not required.
Either way, we should hide this information, and we need to make sure
the server no longer checks if required extra questions have been
answered.
|
|/
|
|
|
|
| |
If a body was set to Open311, and a contact set to Email, it was
impossible to unset the contact's send method and set an Open311
code, because it would always demaned a valid email address.
|
|\ |
|
| | |
|
| |
| |
| |
| |
| | |
Remove all existing hard-coded register_category calls, and have
a new way of implementing staff_ignore.
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
There was a small bug where the 'default_to_body' permission would
override the 'report anonymously' button when staff users were adding
reports to the site. The result of this was that the name of the
anonymous user record would be shown. No harm done, as that user's name
would likely be set to "Anonymous user" in config, but it resulted in
reports pages showing the slightly odd wording along the lines of:
Reported in the Bin bags category by Anonymous user at 14:57 today
This commit ensures the contributing_as_body flag is mutually exclusive
with the 'report_anonymously' request parameter.
|
|
|
|
|
| |
If an extra field on a category has a protected flag then do not
overwrite or remove it when populating categories.
|
| |
|