Merge pull request '更新CLA admin操作流程，增加提示，调整字段' (#58) from KingChan/forgeplus:chenjing into standalone_develop

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

@@ -10,32 +10,54 @@ $(document).on('turbolinks:load', function(){
 
     //  organizations open cla
     $('.organizations-list-container').on('click', '.open-cla-action', function(){
-      var $action = $(this);
+      var $openClaAction = $(this);
+      var $closeClaAction = $openClaAction.siblings('.close-cla-action');
 
-      var userId = $action.data('id');
+      var userId = $openClaAction.data('id');
-      $.ajax({
+      customConfirm({
-        url: '/admins/organizations/' + userId + '/open_cla',
+        content: '确认开通吗？',
-        method: 'POST',
+        ok: function () {
-        dataType: 'json',
+          $.ajax({
-        success: function() {
+            url: '/admins/organizations/' + userId + '/open_cla',
-          showSuccessNotify();
+            method: 'POST',
+            dataType: 'json',
+            success: function() {
+              showSuccessNotify();
+              $closeClaAction.show();
+              $openClaAction.hide();
+            },
+            error: function(res){
+              $.notify({ message: res.responseJSON.message }, { type: 'danger' });
+            }
+          });
         }
-      });
+      })
     });
 
      //  organizations close cla
     $('.organizations-list-container').on('click', '.close-cla-action', function(){
-      var $action = $(this);
+      var $closeClaAction  = $(this);
+      var $openClaAction= $closeClaAction.siblings('.open-cla-action');
 
-      var userId = $action.data('id');
+      var userId = $openClaAction.data('id');
-      $.ajax({
+      customConfirm({
-        url: '/admins/organizations/' + userId + '/close_cla',
+        content: '确认关闭吗？',
-        method: 'POST',
+        ok: function () {
-        dataType: 'json',
+          $.ajax({
-        success: function() {
+            url: '/admins/organizations/' + userId + '/close_cla',
-          showSuccessNotify();
+            method: 'POST',
+            dataType: 'json',
+            success: function() {
+              showSuccessNotify();
+              $openClaAction.show();
+              $closeClaAction.hide();
+            },
+            error: function(res){
+              $.notify({ message: res.responseJSON.message }, { type: 'danger' });
+            }
+          });
         }
-      });
+      })
     });
 
     

app/controllers/admins/organizations_controller.rb

@@ -11,15 +11,18 @@ class Admins::OrganizationsController < Admins::BaseController
 
 
   def open_cla
-    @org = Organization.find(params[:id])
     @org.open_cla!
     render_ok
   end
 
   def close_cla
-    @org = Organization.find(params[:id])
+    if @org.cla.nil?
-    @org.close_cla!
+      @org.close_cla!
-    render_ok
+      render_ok
+    else
+      render_error(' 该组织已创建CLA 不允许关闭')
+    end
+    
   end
 
   def show

app/controllers/organizations/clas_controller.rb

@@ -9,7 +9,7 @@ class Organizations::ClasController < Organizations::BaseController
     end
 
     def create
-        tip_exception("您的组织还未拥有创建CLA权限，请联系管理员") if @organization.cla == false
+        tip_exception("您的组织还未拥有创建CLA权限，请联系管理员") if @organization.enabling_cla == false
         ActiveRecord::Base.transaction do
             if @organization.cla.present?
                 return tip_exception("组织已存在CLA！") 

app/models/ci/user.rb

@@ -47,7 +47,7 @@
 #  watchers_count             :integer          default("0")
 #  devops_step                :integer          default("0")
 #  sign_cla                   :boolean          default("0")
-#  cla                        :boolean          default("0")
+#  enabling_cla               :boolean          default("0")
 #
 # Indexes
 #

app/models/organization.rb

@@ -47,7 +47,7 @@
 #  watchers_count             :integer          default("0")
 #  devops_step                :integer          default("0")
 #  sign_cla                   :boolean          default("0")
-#  cla                        :boolean          default("0")
+#  enabling_cla               :boolean          default("0")
 #
 # Indexes
 #
@@ -194,15 +194,15 @@ class Organization < Owner
   end
 
   def open_cla!
-    update_attribute(:cla, true)
+    update_attribute(:enabling_cla, true)
   end
 
   def close_cla!
-    update_attribute(:cla, false)
+    update_attribute(:enabling_cla, false)
   end
 
   def open_cla?
-    cla == true
+    enabling_cla == true
   end
 
 end

app/models/user.rb

@@ -47,7 +47,7 @@
 #  watchers_count             :integer          default("0")
 #  devops_step                :integer          default("0")
 #  sign_cla                   :boolean          default("0")
-#  cla                        :boolean          default("0")
+#  enabling_cla               :boolean          default("0")
 #
 # Indexes
 #

app/views/organizations/organizations/_detail.json.jbuilder

@@ -17,4 +17,4 @@ json.news_content organization.news_content
 json.memo organization.memo
 json.news_title organization.news_title
 json.news_url organization.news_url
-json.cla organization.cla
+json.enabling_cla organization.enabling_cla

db/migrate/20230613082850_change_cal_to_enabling_cla_for_users.rb

@@ -0,0 +1,5 @@
+class ChangeCalToEnablingClaForUsers < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :users, :cla ,:enabling_cla
+  end
+end