aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js13
-rw-r--r--web/cobrands/fixmystreet/staff.js6
2 files changed, 11 insertions, 8 deletions
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index e5066b143..ab4a5137f 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -436,12 +436,11 @@ $.extend(fixmystreet.set_up, {
// Delegation is necessary because #form_category may be replaced during the lifetime of the page
$("#problem_form").on("change.category", "select#form_category", function(){
var args = {
- category: $(this).val()
+ category: $(this).val(),
+ latitude: $('input[name="latitude"]').val(),
+ longitude: $('input[name="longitude"]').val()
};
- args.latitude = $('input[name="latitude"]').val();
- args.longitude = $('input[name="longitude"]').val();
-
$.getJSON('/report/new/category_extras', args, function(data) {
var $category_meta = $('#category_meta');
$('#js-councils_text').html(data.councils_text);
@@ -458,7 +457,11 @@ $.extend(fixmystreet.set_up, {
});
if (fixmystreet.hooks.update_problem_fields) {
- fixmystreet.hooks.update_problem_fields($(this).data('role'), $(this).data('body'), args);
+ args.prefill_reports = $(this).data('prefill');
+ args.role = $(this).data('role');
+ args.body = $(this).data('body');
+
+ fixmystreet.hooks.update_problem_fields(args);
}
});
},
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index 48bd36909..32824a563 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -429,10 +429,10 @@ $.extend(fixmystreet.set_up, {
});
$.extend(fixmystreet.hooks, {
- update_problem_fields: function(role, body, args) {
- if (role == 'inspector') {
+ update_problem_fields: function(args) {
+ if (args.prefill_reports && args.role == 'inspector') {
var title = args.category + ' problem has been scheduled for fixing';
- var description = args.category + ' problem found - scheduled for fixing by ' + body;
+ var description = args.category + ' problem found - scheduled for fixing by ' + args.body;
var $title_field = $('#form_title');
var $description_field = $('#form_detail');