| Commit message (Collapse) | Author | Age | Lines |
| |
|
|
|
|
|
| |
92dfeac used an incorrect user column name in the new lookup,
and there was no test to catch the regression.
|
|
|
|
|
|
|
|
|
|
| |
Three file inputs, progressively enhanced with dropzone.
This moves the photo input higher up, so that photos can upload while
you're filling out the form. It standardises and improves photo error
handling.
[fixmystreet.com] Guidance for what photos should and shouldn’t include.
|
|
|
|
|
|
|
|
|
|
|
|
| |
5c79337 simplified a bit too far, as after then a particular cobrand
could in Nearby and My only filter reports to a particular body, not
any other criteria. To fix this, introduce more generic functions in
the default cobrand to allow more flexibility.
Make sure a few tests delete their bodies fully so that new tests
pass when run as part of the suite.
Fixes #1289.
|
| |
|
|\ |
|
| | |
|
| |
| |
| |
| | |
Command line scripts don't need a full blown app, just database.
|
|/ |
|
|
|
|
|
| |
This puts all static pages under /about, and lets you add new static
pages by placing new HTML in your about template directory.
|
| |
|
|
|
|
|
|
|
|
| |
* Don't show a categories summary unless asked via a link
* Don't needlessly join in questionnaire/update summaries
* Switch count(distinct()) to a subselect as it turns out
select count(*) from (select distinct(user_id) from problem) temp;
is a lot quicker than select count(distinct(user_id)) from problem;
|
|
|
|
|
|
|
| |
This removes the on map/nearby tabs, replacing them with one combined
list. The styling is moved to the base, so that it is used on mobile
too. A closed option is added to the existing dropdown, and the
base/fixmystreet my templates are also combined. Fixes #1141.
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
The aim is to combine base and fixmystreet as much as possible,
providing enough template/styling hooks for any cobrand. This
commit removes the need for separate base/fixmystreet templates
for the front page, almost all of the /around templates, the
open graph headers, and the low level item list templates.
|
| | |
|
| |
| |
| |
| |
| | |
These still use the old method of storing photos, not PhotoSet, and
so don't have a get_photoset method.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Includes a small map at the top of the first page and a second
full-width map on a separate page.
- upgrades tiles to the new 512px ones already used by JS
as implemented in https://github.com/mysociety/FixMyStreet-Commercial/issues/668
- Uses jQuery to clone a copy of the "noscript" map elsewhere into
the DOM, because the original is too far from where we need it.
- extracts maps/openlayers.html to call maps/noscript_map.html
- specialises the Zurich version to allow a richer structure to be
returned, including arbitrary sized map
- Map::Zurich now returns nearly arbitrary sized map tiles
- second larger map is prepared (only for admin/report_edit)
See mysociety/FixMyStreet-Commercial#677
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
See mysociety/FixMyStreet-Commercial#690
I understand redirection to summary page was introduced at ZWN's request,
to make it easy to
process reports and then quickly move onto the next one.
However, during testing now, Tobias has mentioned this is a) slowing
things down and b) confusing because it's not obvious that the report
has been saved.
I've tried to address (b) by adding the "Aktualisiert!" message when
you are redirected.
Also, for (a) I've removed the redirection from a few cases, and
disabled it for superuser. If need be, I can remove redirection from
more (or all) cases.
Fix Official answer/Reply to user
- hide label for status update on state change
- correct wording on button for closure (single wording)
- correct wording on label for user reply (either "Official answer" or "Reply to user" as appropriate)
- Make sure the official response texts are shown for edit/static as appropriate, and test.
- javascript improvements
- honour public status update for Extern/Wunsch too
- don't show public message for Wunsch
- Ignore all other fields when rotating photos.
(See mysociety/FixMyStreet-Commercial#718)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Requirements:
=============
1: DM to be able to mark a problem as Wish, Extern, Not contactable,
Hidden, Jurisdiction unknown
2: SDM to be able to mark a problem as Not contactable.
3: DM to be able to add information to such a problem, and trigger
emails to external agencies, and to user, closing the problem at the
same time.
4: Closed reports must be categorized as Wish/Extern/NC/Hidden/JU for
statistical reporting
5: Non-closed reports must appear as open, to allow DM to see them in
the list, similar to what is currently done for Ruckmeldung Ausstehend
(Feedback outstanding).
5b: however "Hidden" problems must be immediately hidden from public
view.
Proposal:
=========
a) Requirement 1 will be carried out in exactly the same way by
DM. e.g. Category dropdown select
b) Requirement 2 will be carried out in exactly the same way by SDM.
e.g. "Not contactable" button
c) BUT, for a), c), the category will be diverted to "Ruckmeldung
Ausstehend" (Feedback outstanding), and metadata will be saved with the
appropriate closure type.
d) NOTE: this means the report will still be visible to public as "In
bearbeitung" (Except for Hidden reports, as per 5b)
e) The extra fields will be presented on the "Ruckmeldung Ausstehend"
page, just as defined in the PDF, depending on the metadata. e.g.
- Wish: Zustaendige Stelle + Message
- Extern: External body + Message2
- Not contactable: (no extra info)
- Hidden: (no extra info)
- Jurisdiction unknown: (no extra info)
f) When the DM publishes the answer (e.g. "Antwort Veroeffentlichen"
button), the state will normally change to Fixed. BUT in the new cases,
the metadata saved in step c) will be checked, and the report will
change state to Wish/Extern/Not contactable/Hidden/Jurisdiction unknown,
as appropriate. The report will now be visible/hidden as previously
discussed depending on the new state.
g) If the report is edited again (in /admin/report_edit) it will be in
the relevant state, and any extra fields will be visible as per e).
Those fields may be updated.
Alternatively, the state may be changed, possibly triggering a) again,
and clearing any metadata.
- Fix javascript interactions 690
- show new statuses in summary
- fix photos on SDM page
- fix Planned => Planned+metadata transition
- stop "assignation .select" js affecting templates
- fix redirection for Extern and generally
See mysociety/FixMyStreet-Commercial#672, mysociety/FixMyStreet-Commercial#690
|
| |
| |
| |
| |
| |
| |
| | |
Have moved the generation of banner text from the template into
problem_as_hashref
See mysociety/FixMyStreet-Commercial#672
|
| |
| |
| |
| |
| |
| |
| |
| | |
See issue in mysociety/FixMyStreet-Commercial#663 with
problems not appearing in the "Erfasst" filter. It looks like Zurich
requires a single id in the `bodies_str` (like '4'), and may rely on the
configuration of bodies/contacts in database to be perfect to avoid them
becoming something like '4|47,48'.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Mechanism is general, but current implementation only used
for Zurich.
- Zurich: Record time_spent field mysociety/FixMyStreet-Commercial#676
- template changes (including jQuery spinner)
- backend changes to save data are made:
- in log_edit, if supplied
- and time on category change (and arbitrary actions)
- Add update_admin_log to all paths for DM, ensuring that it gets called,
while resetting the `time_spent` parameter, to make sure that
there is never a duplicate record created.
- Also quell warning about using DateTime values in query.
- Also add (seemingly unrelated) parens to stop misparsing of OK line in
questionnaire test now that DT::Format::Pg is used in Zurich cobrand
See mysociety/FixMyStreet-Commercial#676
|
| |
| |
| |
| |
| |
| |
| | |
This provides a ResponseTemplate model that an admin/staff
user can choose from when responding to problems.
For mysociety/FixMyStreet-Commercial#671.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Save 'photo_required' value in Contact->extra from admin edit form
- Enforce per-category photo requirement on new reports
A new step has been added to the photo upload process that
ensures a photo is present if any of the categories chosen for
the report require it.
If the photo is missing an error is displayed to the user in the
same manner as if the photo upload was invalid.
- Add test of mandatory photo categories
|
| |
| |
| |
| |
| |
| |
| |
| | |
For Zurich, see mysociety/FixMyStreet-Commercial#664.
This commit includes a new PhotoSet class (NB: called Model:: though not
really a model), should handle binary data (e.g. old style photos in
database), fileids (40-char hash), and Catalyst::Upload objects.
|
|/
|
|
| |
See mysociety/FixMyStreet-Commercial#669
|
| |
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
Treat an update left during a questionnaire the same as one left on a
report page, ie. pass it through cleanup_text. This will also make sure
updates left that are wholly whitespace are errored, or replaced with
the default text.
|
|\ \ |
|
| |/
| |
| |
| | |
Add a site_name template parameter available to all templates.
|
|/
|
|
| |
Fixes #1210.
|
|
|
|
| |
Fixes #1091.
|
|
|
|
| |
This makes testing easier.
|
|
|
|
|
|
| |
If a cobrand has a body restriction, then a report without any body
won't be shown on it, so we need to make sure links to the report (in
email alerts and RSS) are to the base URL, not the cobrand.
|
|\ |
|
| | |
|
| |
| |
| |
| |
| | |
Matches send_email, remove unneeded setting of sender in one call, and
add contact name to report sent email.
|
| |
| |
| |
| |
| |
| |
| | |
Make dashboard work properly in two-tier councils, showing reports sent
to both. Create an index on the array of the bodies_str column to speed
up performance, and use that throughout the code replacing all LIKE
scans. This also enables a simplifying tidy of the restriction code.
|
| |
| |
| |
| | |
Fixes #893.
|
|/ |
|
|
|
|
|
| |
This override is not used anywhere, it dates from a very old long-gone
test script, and causes issues with database query planning.
|
| |
|
| |
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add a special category email address used to show an unresponsive
message and page when trying to report in that category. Add a "Refused"
send method for setting a whole body to be unresponsive and show the
message immediately, not on category selection.
Factor out category template, and put at top where needed.
|
|/
|
|
|
| |
Because a body can cover more than one area, `area_ids` might contain
multiple values when updating or creating a body.
|
|
|
|
|
|
|
| |
Restrict email_sign_in token to one day, unused confirmation tokens to
one month. Used tokens will redirect to the created thing but not log
in; don't log in with alert links (unsubscribe link never expires, reply
link will still show "reopen" tickbox).
|