Merge branch 'release/0.8'

mysociety · Mar 19, 2013 · 82f2c3c · 82f2c3c
2 parents 0adcb32 + f8ee42c
commit 82f2c3c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/app/views/admin_general/admin.coffee b/app/views/admin_general/admin.coffee
@@ -10,7 +10,7 @@ jQuery ->
         false)
     $('#request_hidden_user_explanation_reasons input').live('click', ->
         $('#request_hidden_user_subject, #request_hidden_user_explanation, #request_hide_button').show()
-        info_request_id = $('#hide_request_form').attr('info_request_id')
+        info_request_id = $('#hide_request_form').attr('data-info-request-id')
         reason = $(this).val()
         $('#request_hidden_user_explanation_field').attr("value", "[loading default text...]")
         $.ajax "/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id,

diff --git a/app/views/admin_general/admin.js b/app/views/admin_general/admin.js
@@ -14,7 +14,7 @@
     return $('#request_hidden_user_explanation_reasons input').live('click', function() {
       var info_request_id, reason;
       $('#request_hidden_user_subject, #request_hidden_user_explanation, #request_hide_button').show();
-      info_request_id = $('#hide_request_form').attr('info_request_id');
+      info_request_id = $('#hide_request_form').attr('data-info-request-id');
       reason = $(this).val();
       $('#request_hidden_user_explanation_field').attr("value", "[loading default text...]");
       return $.ajax("/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id, {

diff --git a/app/views/admin_general/admin_js.erb b/app/views/admin_general/admin_js.erb
@@ -1,4 +1,5 @@
 (function() {
+
   jQuery(function() {
     $('.locales a:first').tab('show');
     $('.accordion-body').on('hidden', function() {
@@ -14,7 +15,7 @@
     return $('#request_hidden_user_explanation_reasons input').live('click', function() {
       var info_request_id, reason;
       $('#request_hidden_user_subject, #request_hidden_user_explanation, #request_hide_button').show();
-      info_request_id = $('#hide_request_form').attr('info_request_id');
+      info_request_id = $('#hide_request_form').attr('data-info-request-id');
       reason = $(this).val();
       $('#request_hidden_user_explanation_field').attr("value", "[loading default text...]");
       return $.ajax("/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id, {
@@ -29,4 +30,5 @@
       });
     });
   });
+
 }).call(this);
diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml
@@ -121,7 +121,7 @@
       <p class="help-block">(see also option to general URLs for individual incoming messages below)</p>
     </div>
   </div>
-  <% form_tag admin_request_hide_path(@info_request), :class => "form form-inline", :id => "hide_request_form" do %>
+  <% form_tag admin_request_hide_path(@info_request), :class => "form form-inline", :id => "hide_request_form", 'data-info-request-id' => @info_request.id.to_s do %>
     <div class="control-group">
       <% if  @info_request.is_external? %>
         <label class="control-label">Hide the request:</label>

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
@@ -16,6 +16,6 @@ The javascript is included in a funky way
 To change it, edit the coffeescript at
 `lib/view/general/admin.coffee`, and then do something like:
 
-    $ coffee -o /tmp/ -c lib/views/general/admin.coffee
-    $ mv /tmp/admin.js lib/views/general/admin_js.erb
+    $ coffee -o /tmp/ -c app/views/admin_general/admin.coffee
+    $ mv /tmp/admin.js app/views/admin_general/admin_js.erb