diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/admin_general/admin.coffee | 2 | ||||
| -rw-r--r-- | app/views/admin_general/admin.js | 2 | ||||
| -rw-r--r-- | app/views/admin_general/admin_js.erb | 4 | ||||
| -rw-r--r-- | app/views/admin_request/show.html.erb | 2 | ||||
| -rw-r--r-- | app/views/user/sign.html.erb | 4 |
6 files changed, 10 insertions, 7 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 5a8b1fe55..c4d96eb78 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -79,7 +79,7 @@ class AdminController < ApplicationController return else if session[:using_admin].nil? || session[:admin_name].nil? - if params[:emergency].nil? + if params[:emergency].nil? || AlaveteliConfiguration::disable_emergency_user if authenticated?( :web => _("To log into the administrative interface"), :email => _("Then you can log into the administrative interface"), @@ -89,7 +89,6 @@ class AdminController < ApplicationController session[:using_admin] = 1 session[:admin_name] = @user.url_name else - session[:using_admin] = nil session[:user_id] = nil session[:admin_name] = nil diff --git a/app/views/admin_general/admin.coffee b/app/views/admin_general/admin.coffee index 8f9e879ae..3d39369a4 100644 --- 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 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, { diff --git a/app/views/admin_general/admin_js.erb b/app/views/admin_general/admin_js.erb index 61382dab3..c8788a452 100644 --- 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.html.erb b/app/views/admin_request/show.html.erb index f3b9c7af9..67f10c182 100644 --- a/app/views/admin_request/show.html.erb +++ b/app/views/admin_request/show.html.erb @@ -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", :info_request_id => @info_request.id.to_s, :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/app/views/user/sign.html.erb b/app/views/user/sign.html.erb index 6a1979155..5e8cced91 100644 --- a/app/views/user/sign.html.erb +++ b/app/views/user/sign.html.erb @@ -12,7 +12,9 @@ <% end %> </p> <% if @post_redirect.post_params["controller"] == "admin_general" %> - <p id="superuser_message">Don't have a superuser account yet? <%= link_to "Sign in as the emergency user", @post_redirect.uri + "?emergency=1" %></p> + <% unless Configuration::disable_emergency_user %> + <p id="superuser_message">Don't have a superuser account yet? <%= link_to "Sign in as the emergency user", @post_redirect.uri + "?emergency=1" %></p> + <% end %> <% end %> <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => true } %> |