Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

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', '');
     })
 

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 = {};

app/controllers/admins/base_controller.rb

@@ -5,6 +5,8 @@ class Admins::BaseController < ApplicationController
 
   layout 'admin'
 
+  skip_before_action :verify_authenticity_token
+
   before_action :require_login, :require_admin!
 
   after_action :rebind_event_if_ajax_render_partial

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
 
 

app/views/admins/shared/_admin_common_refuse_modal.html.erb

@@ -8,14 +8,14 @@
         </button>
       </div>
       <div class="modal-body">
-        <form class="admin-common-refuse-form">
+        <%= form_tag(admins_path, method: :post, class: 'admin-common-refuse-form') do %>
           <%= hidden_field_tag(:apply_id, nil) %>
           <div class="form-group">
             <label for="reason" class="col-form-label">原因:</label>
             <%= text_area_tag(:reason, nil, class: 'form-control', placeholder: '我得说点儿什么，最多200字') %>
           </div>
           <div class="error text-danger"></div>
-        </form>
+        <% end %>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>

app/views/student_works/shixun_work_report.json.jbuilder

@@ -2,6 +2,7 @@ json.homework_common_id @homework.id
 json.category @homework.category_info
 json.course_name @course.name
 json.work_id @work.id
+json.work_efficiency @homework.work_efficiency
 if @shixun
   json.shixun_name @shixun.name
 # 总体评价

public/assets/admin-6e8694047619156313be7c12c6473876ce5a380023504259e6291b35f180e2ce.js

@@ -37601,6 +37601,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', '');
     })
 
@@ -38423,7 +38424,7 @@ $(document).on('turbolinks:load', function() {
 ;
 $(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 = {};

public/assets/application-8a2701332fd4ccefd4fe576618f01bec7a6d0fbb5f51d1d97bad5bfe4ae78091.js

@@ -37601,6 +37601,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', '');
     })
 
@@ -38423,7 +38424,7 @@ $(document).on('turbolinks:load', function() {
 ;
 $(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 = {};