diff --git a/app/assets/javascripts/admins/common-refuse-modal.js b/app/assets/javascripts/admins/common-refuse-modal.js index 5eb2f3f46..2b6afe6e3 100644 --- a/app/assets/javascripts/admins/common-refuse-modal.js +++ b/app/assets/javascripts/admins/common-refuse-modal.js @@ -31,6 +31,7 @@ $(document).on('turbolinks:load', function() { }); $refuseModal.on('hide.bs.modal', function () { $applyIdInput.val(''); + $refuseModal.find('.modal-body input[name="reason"]').val(''); $form.data('url', ''); }) diff --git a/app/assets/javascripts/admins/shixun_settings/index.js b/app/assets/javascripts/admins/shixun_settings/index.js index cff00a7c4..48164f342 100644 --- a/app/assets/javascripts/admins/shixun_settings/index.js +++ b/app/assets/javascripts/admins/shixun_settings/index.js @@ -1,6 +1,6 @@ $(document).on('turbolinks:load', function() { if ($('body.admins-shixun-settings-index-page').length > 0) { - $(".shixun-settings-list-container").on("change", '.shixun-settings-select', function () { + $(".shixun-settings-list-form").on("change", '.shixun-settings-select', function () { var s_value = $(this).val(); var s_name = $(this).attr("name"); var json = {}; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6046be5af..411fa1b29 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -240,7 +240,7 @@ class ApplicationController < ActionController::Base uid_logger("user_setup: " + (User.current.logged? ? "#{User.current.try(:login)} (id=#{User.current.try(:id)})" : "anonymous")) if !User.current.logged? && Rails.env.development? - User.current = User.find 1 + # User.current = User.find 1 end diff --git a/app/views/admins/shared/_admin_common_refuse_modal.html.erb b/app/views/admins/shared/_admin_common_refuse_modal.html.erb index ee1b3177e..10baaef64 100644 --- a/app/views/admins/shared/_admin_common_refuse_modal.html.erb +++ b/app/views/admins/shared/_admin_common_refuse_modal.html.erb @@ -8,14 +8,14 @@