aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--templates/web/base/admin/bodies/open311-form-fields.html2
-rw-r--r--templates/web/base/admin/users/form.html2
-rw-r--r--web/cobrands/fixmystreet/staff.js1
-rw-r--r--web/js/duplicates.js4
4 files changed, 4 insertions, 5 deletions
diff --git a/templates/web/base/admin/bodies/open311-form-fields.html b/templates/web/base/admin/bodies/open311-form-fields.html
index b716cf175..bdd4ad935 100644
--- a/templates/web/base/admin/bodies/open311-form-fields.html
+++ b/templates/web/base/admin/bodies/open311-form-fields.html
@@ -90,7 +90,7 @@
<label for"comment_user_id">[% loc('User ID to attribute fetched comments to') %]</label>
<input type="text" class="form-control" name="comment_user_id" value="[% object.comment_user_id %]">
[% IF object.comment_user_id %]
- <a href="[% c.uri_for('user_edit', object.comment_user_id) %]">[% loc('edit user') %]</a>
+ <a href="[% c.uri_for_action('admin/users/edit', object.comment_user_id) %]">[% loc('edit user') %]</a>
[% END %]
</p>
diff --git a/templates/web/base/admin/users/form.html b/templates/web/base/admin/users/form.html
index ca3fd99fb..bc64a79c7 100644
--- a/templates/web/base/admin/users/form.html
+++ b/templates/web/base/admin/users/form.html
@@ -111,7 +111,7 @@
<p>
[% loc("Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>.") %]
<br>
- [% tprintf(loc("Flagged users are listed on the <a href='%s'>flagged</a> page."), c.uri_for( 'flagged' )) %]
+ [% tprintf(loc("Flagged users are listed on the <a href='%s'>flagged</a> page."), c.uri_for_action( 'admin/flagged' )) %]
<br>
[% loc("You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create.") %]
</p>
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index a7e0c8896..7dccedcd9 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -383,7 +383,6 @@ $(fixmystreet).on('display:report', function() {
fixmystreet.staff_set_up.response_templates();
if ($("#report_inspect_form").length) {
fixmystreet.staff_set_up.report_page_inspect();
- fixmystreet.staff_set_up.manage_duplicates();
fixmystreet.staff_set_up.action_scheduled_raise_defect();
}
});
diff --git a/web/js/duplicates.js b/web/js/duplicates.js
index 4ed54846c..d80eb9a2d 100644
--- a/web/js/duplicates.js
+++ b/web/js/duplicates.js
@@ -190,10 +190,10 @@ $(function() {
$("#problem_form").on("change.category", "select#form_category", problem_form_category_change);
// Want to show duplicates when an inspector sets a report’s state to "duplicate".
- $("#report_inspect_form").on("change.state", "select#state", inspect_form_state_change);
+ $(document).on('change.state', "#report_inspect_form select#state", inspect_form_state_change);
// Also want to give inspectors a way to select a *new* duplicate report.
- $("#js-change-duplicate-report").click(refresh_duplicate_list);
+ $(document).on('click', "#js-change-duplicate-report", refresh_duplicate_list);
$('.js-hide-duplicate-suggestions').on('click', function(e){
e.preventDefault();