From 90be9823d467ca2f0a03661edfa9b89d5c6ca258 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 31 Aug 2019 09:05:51 +0800 Subject: [PATCH 1/3] admins: fix --- .../javascripts/admins/common-refuse-modal.js | 1 + .../admins/shixun_settings/index.js | 2 +- app/controllers/application_controller.rb | 2 +- .../_admin_common_refuse_modal.html.erb | 4 ++-- ...fest-1c370772f16743f825981ab0e5c94237.json | 2 +- ...473876ce5a380023504259e6291b35f180e2ce.js} | 3 ++- ...876ce5a380023504259e6291b35f180e2ce.js.gz} | Bin 327554 -> 327558 bytes ...f01bec7a6d0fbb5f51d1d97bad5bfe4ae78091.js} | 3 ++- ...1bec7a6d0fbb5f51d1d97bad5bfe4ae78091.js.gz | Bin 0 -> 934584 bytes ...3b9aeaa6db572dec8b9f399f6ecef463efd7.js.gz | Bin 934580 -> 0 bytes 10 files changed, 10 insertions(+), 7 deletions(-) rename public/assets/{admin-09270f9cd6af4e44c0e843f307a0b607cc91c77f662b59489cd02ba0930fa5ab.js => admin-6e8694047619156313be7c12c6473876ce5a380023504259e6291b35f180e2ce.js} (99%) rename public/assets/{admin-09270f9cd6af4e44c0e843f307a0b607cc91c77f662b59489cd02ba0930fa5ab.js.gz => admin-6e8694047619156313be7c12c6473876ce5a380023504259e6291b35f180e2ce.js.gz} (98%) rename public/assets/{application-de4390096dd5da70c80c36f7479e3b9aeaa6db572dec8b9f399f6ecef463efd7.js => application-8a2701332fd4ccefd4fe576618f01bec7a6d0fbb5f51d1d97bad5bfe4ae78091.js} (99%) create mode 100644 public/assets/application-8a2701332fd4ccefd4fe576618f01bec7a6d0fbb5f51d1d97bad5bfe4ae78091.js.gz delete mode 100644 public/assets/application-de4390096dd5da70c80c36f7479e3b9aeaa6db572dec8b9f399f6ecef463efd7.js.gz 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 @@