admins: fix user lock and unlock && competition enroll error message

app/assets/javascripts/admins/users/index.js

@@ -15,15 +15,19 @@ $(document).on('turbolinks:load', function(){
       var $unlockAction = $lockAction.siblings('.unlock-action');
 
       var userId = $lockAction.data('id');
-
+      customConfirm({
-      $.ajax({
+        content: '确认加锁吗？',
-        url: '/admins/users/' + userId + '/lock',
+        ok: function(){
-        method: 'POST',
+          $.ajax({
-        dataType: 'json',
+            url: '/admins/users/' + userId + '/lock',
-        success: function() {
+            method: 'POST',
-          showSuccessNotify();
+            dataType: 'json',
-          $lockAction.hide();
+            success: function() {
-          $unlockAction.show();
+              showSuccessNotify();
+              $lockAction.hide();
+              $unlockAction.show();
+            }
+          });
         }
       });
     });
@@ -34,17 +38,21 @@ $(document).on('turbolinks:load', function(){
       var $lockAction = $unlockAction.siblings('.lock-action');
 
       var userId = $unlockAction.data('id');
-
+      customConfirm({
-      $.ajax({
+        content: '确认解锁吗？',
-        url: '/admins/users/' + userId + '/unlock',
+        ok: function () {
-        method: 'POST',
+          $.ajax({
-        dataType: 'json',
+            url: '/admins/users/' + userId + '/unlock',
-        success: function() {
+            method: 'POST',
-          showSuccessNotify();
+            dataType: 'json',
-          $lockAction.show();
+            success: function() {
-          $unlockAction.hide();
+              showSuccessNotify();
+              $lockAction.show();
+              $unlockAction.hide();
+            }
+          });
         }
-      });
+      })
     });
 
     // active user
@@ -54,18 +62,22 @@ $(document).on('turbolinks:load', function(){
       var $lockAction = $activeAction.siblings('.lock-action');
 
       var userId = $activeAction.data('id');
-
+      customConfirm({
-      $.ajax({
+        content: '确认激活吗？',
-        url: '/admins/users/' + userId + '/unlock',
+        ok: function () {
-        method: 'POST',
+          $.ajax({
-        dataType: 'json',
+            url: '/admins/users/' + userId + '/unlock',
-        success: function() {
+            method: 'POST',
-          showSuccessNotify();
+            dataType: 'json',
-          $activeAction.hide();
+            success: function() {
-          $lockAction.show();
+              showSuccessNotify();
-          $unlockAction.hide();
+              $activeAction.hide();
+              $lockAction.show();
+              $unlockAction.hide();
+            }
+          });
         }
-      });
+      })
     });
 
     // ***************** reward grade modal *****************

app/controllers/admins/users_controller.rb

@@ -32,13 +32,13 @@ class Admins::UsersController < Admins::BaseController
   end
 
   def lock
-    User.find(params[:user_id]).lock!
+    User.find(params[:id]).lock!
 
     render_ok
   end
 
   def unlock
-    User.find(params[:user_id]).activate!
+    User.find(params[:id]).activate!
 
     render_ok
   end

app/views/admins/users/shared/_user_list.html.erb

@@ -33,14 +33,14 @@
 
             <%= javascript_void_link('奖励', class: 'action reward-grade-action', data: { toggle: 'modal', target: '.admin-users-reward-grade-modal', id: user.id }) %>
 
-            <%= javascript_void_link '解锁', class: 'action unlock-action', data: { id: user.id, confirm: '确认解锁吗？' }, style: user.locked? ? '' : 'display: none;' %>
+            <%= javascript_void_link '解锁', class: 'action unlock-action', data: { id: user.id }, style: user.locked? ? '' : 'display: none;' %>
 
             <% if user.registered? %>
-              <%= javascript_void_link '激活', class: 'action active-action', data: { id: user.id, confirm: '确认激活吗？' } %>
+              <%= javascript_void_link '激活', class: 'action active-action', data: { id: user.id } %>
             <% end %>
 
             <% if user.id != current_user.id %>
-              <%= javascript_void_link '加锁', class: 'action lock-action', data: { id: user.id, confirm: '确认加锁吗？' }, style: user.locked? || user.registered? ? 'display: none;' : '' %>
+              <%= javascript_void_link '加锁', class: 'action lock-action', data: { id: user.id }, style: user.locked? || user.registered? ? 'display: none;' : '' %>
             <% end %>
 
             <%= delete_link '删除', admins_user_path(user, element: ".user-item-#{user.id}"), class: 'delete-user-action' %>

config/locales/forms/save_team_form.zh-CN.yml

@@ -17,9 +17,9 @@
             teacher_ids:
               enroll_forbidden: "本竞赛的参赛者限定为：学生"
               invalid_count: "教师数量应为%{minimum}~%{maximum}人"
-              enrolled: "教师 ${names} 已加入其它战队了"
+              enrolled: "教师 %{names} 已加入其它战队了"
             member_ids:
               enroll_forbidden: "本竞赛的参赛者限定为：教师"
               invalid_count: "队员数量应为%{minimum}~%{maximum}人"
-              enrolled: "队员 ${names} 已加入其它战队了"
+              enrolled: "队员 %{names} 已加入其它战队了"