diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 18:56:20 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 18:56:20 -0700 |
| commit | 56127c664a4f51e18728ed08bdf00064efee89c2 (patch) | |
| tree | cd04bdcc929ea4232d44d02f51192f6459928769 /app/views/admin_general/admin.js | |
| parent | f7878a229b597b5fc7ba8172c8e8c94a8fd9d7b6 (diff) | |
| parent | dc71db3f98c64fb93ac7d74b8a424f7849a33786 (diff) | |
Merge branch 'develop' into rails-3-develop
Conflicts:
Gemfile
Gemfile.lock
app/views/admin_request/show.html.erb
config/environment.rb
Diffstat (limited to 'app/views/admin_general/admin.js')
| -rw-r--r-- | app/views/admin_general/admin.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin_general/admin.js b/app/views/admin_general/admin.js index 61382dab3..9daa51459 100644 --- 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, { |