Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/assets/javascripts/admin.js

@@ -19,6 +19,13 @@
 //= require_tree ./i18n
 //= require_tree ./admins
 
+
+$.ajaxSetup({
+  beforeSend: function(xhr) {
+    xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'));
+  }
+});
+
 // ******** select2 global config ********
 $.fn.select2.defaults.set('theme', 'bootstrap4');
 $.fn.select2.defaults.set('language', 'zh-CN');
@@ -53,7 +60,6 @@ $(document).on("turbolinks:before-cache", function () {
   $('[data-toggle="tooltip"]').tooltip('hide');
   $('[data-toggle="popover"]').popover('hide');
 });
-
 // var progressBar = new Turbolinks.ProgressBar();
 
 // $(document).on('ajax:send', function(event){

app/assets/javascripts/admins/common-refuse-modal.js

@@ -27,11 +27,11 @@ $(document).on('turbolinks:load', function() {
     });
     // modal visited fire
     $refuseModal.on('shown.bs.modal', function(){
-      $refuseModal.find('.modal-body input[name="reason"]').focus();
+      $refuseModal.find('.modal-body textarea[name="reason"]').focus();
     });
     $refuseModal.on('hide.bs.modal', function () {
       $applyIdInput.val('');
-      $refuseModal.find('.modal-body input[name="reason"]').val('');
+      $refuseModal.find('.modal-body textarea[name="reason"]').val('');
       $form.data('url', '');
     })
 

app/controllers/admins/base_controller.rb

@@ -5,8 +5,6 @@ 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

public/assets/admin-779f7c5e258aaee5078898e7fc89191ec487f64a247b3876e1fbf4850b57a1e1.js

@@ -37597,11 +37597,11 @@ $(document).on('turbolinks:load', function() {
     });
     // modal visited fire
     $refuseModal.on('shown.bs.modal', function(){
-      $refuseModal.find('.modal-body input[name="reason"]').focus();
+      $refuseModal.find('.modal-body textarea[name="reason"]').focus();
     });
     $refuseModal.on('hide.bs.modal', function () {
       $applyIdInput.val('');
-      $refuseModal.find('.modal-body input[name="reason"]').val('');
+      $refuseModal.find('.modal-body textarea[name="reason"]').val('');
       $form.data('url', '');
     })
 
@@ -38804,6 +38804,13 @@ $(document).on('turbolinks:load', function(){
 
 
 
+
+
+$.ajaxSetup({
+  beforeSend: function(xhr) {
+    xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'));
+  }
+});
 
 // ******** select2 global config ********
 $.fn.select2.defaults.set('theme', 'bootstrap4');
@@ -38839,7 +38846,6 @@ $(document).on("turbolinks:before-cache", function () {
   $('[data-toggle="tooltip"]').tooltip('hide');
   $('[data-toggle="popover"]').popover('hide');
 });
-
 // var progressBar = new Turbolinks.ProgressBar();
 
 // $(document).on('ajax:send', function(event){

public/assets/application-9374761be25cf391749604bc068cc03258aad7eb92fa70be837107f924020d15.js

@@ -37597,11 +37597,11 @@ $(document).on('turbolinks:load', function() {
     });
     // modal visited fire
     $refuseModal.on('shown.bs.modal', function(){
-      $refuseModal.find('.modal-body input[name="reason"]').focus();
+      $refuseModal.find('.modal-body textarea[name="reason"]').focus();
     });
     $refuseModal.on('hide.bs.modal', function () {
       $applyIdInput.val('');
-      $refuseModal.find('.modal-body input[name="reason"]').val('');
+      $refuseModal.find('.modal-body textarea[name="reason"]').val('');
       $form.data('url', '');
     })
 
@@ -38804,6 +38804,13 @@ $(document).on('turbolinks:load', function(){
 
 
 
+
+
+$.ajaxSetup({
+  beforeSend: function(xhr) {
+    xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'));
+  }
+});
 
 // ******** select2 global config ********
 $.fn.select2.defaults.set('theme', 'bootstrap4');
@@ -38839,7 +38846,6 @@ $(document).on("turbolinks:before-cache", function () {
   $('[data-toggle="tooltip"]').tooltip('hide');
   $('[data-toggle="popover"]').popover('hide');
 });
-
 // var progressBar = new Turbolinks.ProgressBar();
 
 // $(document).on('ajax:send', function(event){