aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/Cobrand/UKCouncils.pm
Commit message (Collapse)AuthorAgeLines
* [Oxfordshire] Add Exor RDI file download featureDave Arter2017-02-15-1/+1
| | | | | | | | | | 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
* Add permision to view contributor detailspezholio2017-01-17-0/+1
|
* Move staging flags to their own config variable.Matthew Somerville2017-01-10-3/+3
|
* [UK] Include specific domain in user search.Matthew Somerville2016-11-25-4/+11
| | | | | This deals with a bootstrapping issue of adding new admin users that haven't yet interacted with the system.
* If running a dev site, skip some restrictions.Matthew Somerville2016-09-15-0/+4
| | | | This makes it easier to perform manual testing of cobrands.
* Allow user permissions to be granted/revoked in adminDave Arter2016-08-17-0/+10
|
* Restrict user editing in adminDave Arter2016-08-17-0/+27
| | | | | | | | 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.
* [UK Councils] Council users can only see their own council's adminDave Arter2016-07-19-0/+7
|
* [UK Councils] Show all reports on cobrand /around mapDave Arter2016-07-08-0/+7
| | | | | | | | | | | | | | 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.
* [UK] Update base urls for Harrogate, Stevenage.Matthew Somerville2016-06-27-3/+2
| | | | Default future unknown ones to HTTPS.
* Remove stringify call from template pathsDave Arter2016-06-15-5/+5
|
* [UK Councils] Send correct confirm emails for updatesDave Arter2016-06-15-0/+10
| | | | | | | | | | | | | | | | | | | | | | 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.
* Remove final web/fixmystreet templates.Matthew Somerville2016-04-20-1/+0
| | | | And associated, e.g. nothing references fixmystreet-old-box.js any more.
* Fix cobrand restriction of My/Nearby.Matthew Somerville2015-12-15-8/+8
| | | | | | | | | | | | 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.
* Remove many uses of mySociety::Config.Matthew Somerville2015-12-02-1/+1
|
* Reduce use of FixMyStreet::App.Matthew Somerville2015-12-02-1/+1
| | | | Command line scripts don't need a full blown app, just database.
* Use base URL in cobrand alert for no-body report.Matthew Somerville2015-09-03-2/+9
| | | | | | 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.
* Simplify/consolidate body restriction db code.Matthew Somerville2015-08-19-17/+4
| | | | | | | 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.
* Factor out all uses of param()/params.Matthew Somerville2015-07-07-5/+5
| | | | | | | 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.
* By default, use area-based alerts.Matthew Somerville2014-12-12-0/+2
| | | | | | | | | 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.
* Tidy up reporting sidebar notes and privacy.Matthew Somerville2014-11-19-0/+9
| | | | For #344 and #935.
* UK. Generic problems_clause for two-tier councilsHakim Cassimally2014-10-10-1/+9
| | | | | | 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)
* Use https for UK site where appropriateStruan Donald2014-07-03-4/+5
| | | | | | | Council redirects, BASE_URL comparisons, hard coded links, email signatures For #488
* [Hart] Guidance related to two_tier, e.g. HCCHakim Cassimally2014-03-05-3/+9
| | | | | | | | Guidance in prominent places (report, all reports, and message on confirming problem.) Should alleviate mysociety/FixMyStreet-Commercial#481 and mysociety/FixMyStreet-Commercial#485
* Don't need this check (plus it called the wrong function).Matthew Somerville2013-09-30-4/+1
|
* Redirect away from incorrect council pages on council sites.Matthew Somerville2013-05-21-2/+18
|
* Merge remote branch 'origin/zurich'Matthew Somerville2013-02-04-6/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Rename council column to bodies_str, and all the related code.Matthew Somerville2012-12-15-3/+3
| |
| * Update reporting to use bodies.Matthew Somerville2012-12-15-1/+1
| |
* | genericise generating the correct base url for a problem for two tierStruan Donald2013-01-10-0/+14
|/ | | | council cobrands.
* Move site_name/site_title into templates where they belong.Matthew Somerville2012-08-17-5/+0
|
* Remove various UK specific code out of Default cobrand into UK one.Matthew Somerville2012-07-13-19/+1
|
* Have a whole fake mapit (for #182) that works if MAPIT_URL is set accordingly.Matthew Somerville2012-07-13-0/+3
| | | | | | | | | 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).
* Make RSS feeds act same as email alerts with links to main site.Matthew Somerville2012-07-06-4/+1
|
* Factor out site_key as that's only used in one place too.Matthew Somerville2012-07-06-1/+5
|
* Factor out the SQL restriction from site_restriction, as it's only used in ↵Matthew Somerville2012-07-06-1/+5
| | | | one place.
* Better council text on alert page.Matthew Somerville2012-05-14-0/+4
|
* Fewer photos on /alert for Bromley.Matthew Somerville2012-04-24-1/+1
|
* Work much better if reporting pin is clicked/dragged in/out of council ↵Matthew Somerville2012-04-17-1/+8
| | | | boundary (CM17).
* fix get_council_sender and make sure it works for uk councilsStruan Donald2012-04-04-1/+15
|
* Merge branch 'redesign'Matthew Somerville2012-03-14-1/+1
|\ | | | | | | | | | | | | | | Conflicts: .gitignore notes/INSTALL perllib/FixMyStreet/App/Controller/Photo.pm perllib/FixMyStreet/Cobrand/FixMyStreet.pm
| * Get test suite all passing again, and fix bug displaying partial photo and ↵Matthew Somerville2012-03-02-1/+1
| | | | | | | | my stupid use of c as a variable.
* | make sure admin summary page handle new cobrand structure correctlyStruan Donald2012-02-02-0/+4
|/
* Remove some unused cobrand functions, start of a base class.Matthew Somerville2012-01-20-1/+1
|
* Give all council cobrands a common parent to use.Matthew Somerville2012-01-13-0/+75