aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * Avoid broken looking singleton images in expandable list itemsZarino Zappia2019-03-28-0/+1
| | | | | | | | | | | | | | | | When an expanded list item has a single image, it would previously float to the right of the list item action buttons, which looked messy. Now, the buttons clear below the floated image, just like the buttons in the individual report page `.problem-header`.
| * Show detailed delivery info in expanded list itemsZarino Zappia2019-03-28-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | Make the expandable list item’s expanded state look more like the regular `.problem-header`, to more strongly imply that you don’t need to visit the individual report page to read more. Since expandable list items now *always* contain more information in their expanded state, there’s no need for the `show_more` flag in the templates. Addresses part of the feedback in mysociety/fixmystreet-commercial#1304.
* | [Northamptonshire] do not display district/borough reportsStruan Donald2019-03-28-0/+7
|/
* Fix archive report script to not skip first row.Matthew Somerville2019-03-28-7/+8
| | | | | | | ->first, as used in cd8a5702, uses the iterator, so ->next will then only return the second onward. Instead, do the needed thing in the first iteration of the loop. Also check the option is set as some scripts do not set it.
* [Northamptonshire] Update report_sent_confirmation_email.Matthew Somerville2019-03-27-1/+1
|
* Merge branch 'issues/commercial/1273-ref-number-com'Matthew Somerville2019-03-27-29/+53
|\
| * [UK] Council reference in .com confirm sent email.Matthew Somerville2019-03-27-14/+37
| |
| * [UK] Fix two-tier message in confirm sent email.Matthew Somerville2019-03-27-15/+16
| |
* | [Bucks,Oxon] Fix .com RoW message display.Matthew Somerville2019-03-27-20/+25
| | | | | | | | The two functions were conflicting with one another.
* | Merge branch 'category-js-tidy'Matthew Somerville2019-03-27-34/+42
|\ \
| * | Fix extra question display when only one category.Matthew Somerville2019-03-27-1/+10
| | | | | | | | | | | | | | | If the site only has the one category, it was being preselected but the extra attribute questions were not being shown.
| * | Stop category_change firing more than it should.Matthew Somerville2019-03-27-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when update_pin was called, category change events were fired: 1. if category wasn't blank, 2. if category groups were enabled, and 3. if category groups were enabled, a group was selected, and a category was not. Now we sort out everything inside the category_groups setup function, only triggering a change event once, at the end.
| * | Allow things to reset if "Pick a category" picked.Matthew Somerville2019-03-27-9/+5
| | | | | | | | | | | | | | | This is most noticeable with category groups, where changing the parent would leave visible any asset/attribute questions.
| * | Stop filter category overriding chosen category.Matthew Somerville2019-03-27-11/+11
| |/ | | | | | | | | | | If you had one filter category selected, clicked the map (category auto pre-selected), changed the category, and clicked the map again, it would re-select the filter category, not the changed category.
* | make sure the archive report script sets up lang etcStruan Donald2019-03-27-0/+8
| | | | | | | | | | | | Previously if no reports were closed with an email this meant that the lang setup never ran and you got an error when _ was called in close_problems. So, we call the lang setup in close_problems too.
* | [Buckinghamshire] Message on Rights of Way category.Matthew Somerville2019-03-27-0/+15
|/
* [Oxfordshire] correctly display PRoW messageStruan Donald2019-03-27-2/+4
| | | | | | This makes sure that we re-enable the report form if you select a non OCC category after selecting PRoW, and also enables correct hiding and displaying of the message.
* [Northamptonshire] only display NCC categories on cobrandStruan Donald2019-03-26-0/+5
|
* [Northamptonshire] stray protocol in asset configStruan Donald2019-03-26-1/+1
|
* [fixmystreet.com] remove Northamptonshire unresponsive textStruan Donald2019-03-26-7/+1
|
* [fixmystreet.com] add NCC layers to national siteStruan Donald2019-03-25-0/+2
|
* make sure found and not_found actions exists before callingStruan Donald2019-03-25-2/+2
| | | | | | just because fixmystreet.actions exists on a layer it does not mean the found or not_found methods are there so check for them too. Otherwise we don't fall back to the default actions as the JS errors.
* [Northamptonshire] Show warning to user when clicking an asset that overlaps ↵Dave Arter2019-03-25-4/+42
| | | | with others
* Add Layer.Vector.getFeaturesWithinDistance methodDave Arter2019-03-25-0/+28
|
* Set this to the current Layer in asset_found/asset_not_found callsDave Arter2019-03-25-8/+8
|
* more obvious delineation between reports in error emailStruan Donald2019-03-25-1/+1
| | | | | It can be hard to see where one error stops and a new one begins in the send reports error emails so put in a more obvious break between them.
* Map JS only on map pages.Matthew Somerville2019-03-25-2/+5
|
* [Northamptonshire] use Alloy vector tiles for assetsStruan Donald2019-03-25-2/+624
| | | | | | | | | | | | | | | | | | | | | | | | | | Use the Vector tiles layers which Alloy provided which don't require and API key or paging. This code is still a bit work in progress as it makes a few assumptions: * the zoom level is hard coded * adding assets to layers assumes things are not async when they are * we are using itemId which is not the correct thing This uses an event to notify that loading a request for a new set of tiles has started and then uses counting to check we've fetched them all and hence can get the layer to check for an asset. It also uses start times to throw away requests for tiles in a previous request if they come in after a new request has started. This also doesn't have anything for putting labels on assets because that information doesn't seem to be in the tiles. A final point is that the tiles can contain multiple assets at the same coőrdinates and we don't do anything about that at the moment so the user will just get the last one added when they click. This includes a dump of all the layers from alloy and then matches them up to categories displayed on FixMyStreet
* [Northamptonshire] cobrand config, template and css changesStruan Donald2019-03-25-0/+509
| | | | | Co-authored-by: Zarino Zappia <zarino@mysociety.org> Co-authored-by: Matthew Somerville <matthew@mysociety.org>
* Allow cobrand customisation of privacy URLStruan Donald2019-03-25-11/+19
| | | | | Add a privacy_policy_url function to the cobrand and use that in the templates instead of hard coding /privacy
* enable custom email header logo fileStruan Donald2019-03-25-2/+4
| | | | | allows adding a logo_file setting in _color_overrides.html to change the name of the file used. Defaults to email-logo.gif
* [fixmystreet.com] update FAQ now we send reports to Highways EnglandStruan Donald2019-03-25-2/+3
|
* [Buckinghamshire] Send drainage reports via email as well as Open311Dave Arter2019-03-20-5/+26
| | | | Fixes mysociety/fixmystreet-commercial#1306
* Merge branch 'open311-hook-update-params'Matthew Somerville2019-03-12-38/+59
|\
| * [Open311] Use cobrand hook for extra update paramsMatthew Somerville2019-03-08-39/+59
| | | | | | | | | | The test has to now create a new comment object each time as `get_cobrand_logged` is cached on the object.
* | [open311] optionally use fixmystreet_id to match update to problemStruan Donald2019-03-12-2/+66
| | | | | | | | | | | | | | | | | | | | | | If an update has a fixmystreet_id field then use the contents of that in preference to the external_id field to match an update to a problem. This handles the case where a report in a third party system passes through different types (eg inspection and defect), resulting in the external id changing. In this case it is sometimes possible to include the fixmystreet id in each type and hence use that to match things up at the fixmystreet side.
* | [Oxfordshire] always send easting/northing over open311Struan Donald2019-03-12-4/+2
| | | | | | | | | | Remove the config that stopped us sending easting/northing if the user had not clicked the map.
* | Check better if extra question has values.Matthew Somerville2019-03-12-2/+4
| | | | | | | | | | If an Open311 server returned an empty set of values, it was possible for this template to then display a set of empty dropdown options.
* | [Open311] Proper bodies check for sending updates.Matthew Somerville2019-03-12-5/+4
| | | | | | | | | | Otherwise running on a site where one body ID is a substring of another, comments can get processed for the wrong body.
* | Let all cobrands treat hidden_fields as hidden.Matthew Somerville2019-03-12-2/+2
| |
* | [UK Councils] Make sure server_set as appropriate.Matthew Somerville2019-03-12-1/+244
|/ | | | | After the change in 1cff2a0e, we need to make sure this is set so that the relevant fields are not shown in the front end.
* [Bromley] Reduce heatmap default time to one monthMatthew Somerville2019-03-08-1/+1
|
* Show all Open311 extra fields in edit admin.Matthew Somerville2019-03-07-3/+1
| | | | Otherwise any such fields are lost upon a manual edit.
* Merge branch 'rabx-utf8-encode'Matthew Somerville2019-03-07-4/+61
|\
| * Make sure raw RABX column is utf8-encoded.Matthew Somerville2019-03-06-4/+61
| | | | | | | | | | | | | | | | | | | | | | | | Without doing this, a call to e.g. $contact->set_extra_fields(@meta) in PopulateServiceList.pm, with an unchanged meta that contains some Unicode values, can write to the database (and cause an unneeded row in the history table), because the column from the database is UTF-8 decoded, whilst the new text is UTF-8 encoded. It looks like an attempt was made in filter_from_storage to fix this issue, but the column comparison for marking a column as dirty takes place without this being called.
* | Listen for all inspector form duplicate events.Matthew Somerville2019-03-06-2/+2
| | | | | | | | | | | | The form may be brought in via JS, so we have to add an event to something that will always be there (or alternatively set up when pulled in, which was the old pre-duplicates.js behaviour).
* | Remove call to removed function.Matthew Somerville2019-03-06-1/+0
| |
* | Fix couple of links broken by admin code refactor.Matthew Somerville2019-03-06-2/+2
|/
* Merge branch 'stream-csv-output'Matthew Somerville2019-03-05-11/+25
|\
| * Stream dashboard CSV output.Matthew Somerville2019-03-05-11/+25
| | | | | | | | | | | | Rather than compile it all into on big string for output, write the output as we go. Also output headers to encourage intermediaries to stream as well.