| Commit message (Collapse) | Author | Age | Lines |
|
|
|
|
|
|
|
|
|
| |
The RDI file format encapsulates information about inspections that have taken
place, and can be uploaded into Exor to create defects in bulk.
This commit adds a page to the Oxfordshire cobrand's admin allowing RDI files
to be generated and downloaded from FMS.
For mysociety/fixmystreetforcouncils#127
|
| |
|
| |
|
|
|
|
|
| |
This deals with a bootstrapping issue of adding new admin users that
haven't yet interacted with the system.
|
|
|
|
| |
This makes it easier to perform manual testing of cobrands.
|
| |
|
|
|
|
|
|
|
|
| |
The 'user_edit' permission is required to edit users.
The admin pages on UK council cobrands only allow editing of users whose
from_body is the same as the logged-in user, or who have sent reports or updates
to the council.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is a concern that excluding district council reports from a two-tier
council's cobrand's /around page might lead to duplicate reports or reports
never being seen.
This commit adds them to the map and the sidebar and displays the destination
council in the report list item. Clicking the pin or the report link leads to
the report on FMS.com.
Reports sent to the a council other than the the active cobrand are shown as
grey pins on the map, and the receiving council's name is shown in the sidebar
list.
|
|
|
|
| |
Default future unknown ones to HTTPS.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some UK councils with Open311 integrations (e.g. Bromley) have a custom wording
in the confirmation email sent when updates are left on reports, to make the
user aware that the update is sent to the council in question.
Bromley noticed that some emails were being sent without this wording, leading
at least one user to contact the council directly about the report.
It turns out that although the email template contains an IF clause to use the
appropriate wording for Bromley (and Stevenage) reports, the incorrect template
file was being used when updates were made via the Bromley cobrand.
This commit solves the problem by introducing a new
`Cobrand::Default::path_to_email_templates` method, which is overridden by
`Cobrand::UKCouncils` to include the `templates/email/fixmystreet` path. Paths
returned by this method are used as the `additional_template_paths` param when
templating emails. A regression test is included.
Additionally moves email templates for fixmystreet.com to a directory name
reflecting their purpose, in the same way the web templates are arranged.
|
|
|
|
| |
And associated, e.g. nothing references fixmystreet-old-box.js any more.
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
Use a central get_param and get_param_list functions dependent on
whether we're after a scalar or a list (almost always a scalar). This
prevents any possibility of confusion where param() could return a list,
or params->{} an arrayref.
|
|
|
|
|
|
|
|
|
| |
The body-based alert only works if the body ID matches the MapIt ID.
This fixes #959. Further work needs to be done to enable proper
body-based alerts that work properly in all circumstances.
Consequently, factor out fixed body IDs from many tests.
Also fix a couple of tests not overriding geocoder correctly.
|
|
|
|
| |
For #344 and #935.
|
|
|
|
|
|
| |
Replace copy-pasted problems_cause declarations in Hart,
Oxfordshire, and East Sussex with a generic override in
UKCouncils.pm (as a bonus also overrides Stevenage)
|
|
|
|
|
|
|
| |
Council redirects, BASE_URL comparisons, hard coded links, email
signatures
For #488
|
|
|
|
|
|
|
|
| |
Guidance in prominent places (report, all reports, and message
on confirming problem.)
Should alleviate mysociety/FixMyStreet-Commercial#481 and
mysociety/FixMyStreet-Commercial#485
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/open311-populate-service-list
bin/send-comments
bin/update-all-reports
conf/crontab.ugly
db/schema.sql
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/App/Controller/Reports.pm
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/LichfieldDC.pm
perllib/FixMyStreet/DB/Result/Open311conf.pm
perllib/FixMyStreet/DB/Result/Problem.pm
perllib/FixMyStreet/DB/ResultSet/Problem.pm
perllib/FixMyStreet/SendReport.pm
perllib/FixMyStreet/SendReport/Email.pm
perllib/FixMyStreet/SendReport/Open311.pm
perllib/Open311/GetServiceRequestUpdates.pm
perllib/Open311/PopulateServiceList.pm
t/app/controller/report_new.t
t/app/controller/rss.t
templates/web/bromley/report/display.html
templates/web/default/admin/council_contacts.html
templates/web/default/common_header_tags.html
templates/web/default/dashboard/index.html
templates/web/default/front/stats.html
templates/web/default/report/_main.html
templates/web/default/report/update-form.html
templates/web/emptyhomes/index.html
templates/web/emptyhomes/report/display.html
templates/web/emptyhomes/report/new/councils_text_all.html
templates/web/emptyhomes/reports/body.html
templates/web/emptyhomes/reports/index.html
templates/web/fixmystreet/report/new/fill_in_details_form.html
templates/web/fixmystreet/report/update-form.html
web/cobrands/fixmystreet/fixmystreet.js
web/js/fixmystreet.js
|
| | |
|
| | |
|
|/
|
|
| |
council cobrands.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
Setting MAPIT_URL to .../fakemapit/ will then return one area, ID 161 and
type ZZZ, whatever co-ordinate it is given. This means the default area
type is now ZZZ, the UK specific types are moved into the UK cobrands, and
the tests updated accordingly to still function (they assume UK-ness a lot,
so probably need an ALLOWED_COBRANDS entry of "fixmystreet: 'localhost'" and
for your host's domain to show fixmystreet too).
|
| |
|
| |
|
|
|
|
| |
one place.
|
| |
|
| |
|
|
|
|
| |
boundary (CM17).
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.gitignore
notes/INSTALL
perllib/FixMyStreet/App/Controller/Photo.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
|
| |
| |
| |
| | |
my stupid use of c as a variable.
|
|/ |
|
| |
|
|
|