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

app/controllers/partners_controller.rb

@@ -26,6 +26,7 @@ class PartnersController < ApplicationController
     if params[:manager_group_id].present?
       # 重命名
       @manager_group = current_partner.partner_manager_groups.find(params[:manager_group_id])
+      return render_error('不能修改管理者权限组名称') if @manager_group.admin?
       @manager_group.update!(name: name)
     else
       # 新建
@@ -35,6 +36,7 @@ class PartnersController < ApplicationController
 
   def remove_manager_group
     manager_group = current_partner.partner_manager_groups.find(params[:manager_group_id])
+    return render_error('不能删除管理者权限组') if manager_group.admin?
     manager_group.destroy!
 
     render_delete_success
@@ -57,6 +59,8 @@ class PartnersController < ApplicationController
 
   def remove_partner_manager
     partner_manager = current_partner.partner_managers.find(params[:manager_id])
+    return render_error('不能删除自己') if partner_manager.user_id == current_user.id && partner_manager.partner_manager_group.admin?
+
     partner_manager.destroy!
 
     render_delete_success

app/controllers/users/authentication_applies_controller.rb

@@ -17,6 +17,6 @@ class Users::AuthenticationAppliesController < Users::BaseAccountController
   private
 
   def create_params
-    params.permit(:name, :gender, :id_number, :upload_image, attachment_ids: [])
+    params.permit(:name, :show_realname, :gender, :id_number, :upload_image, attachment_ids: [])
   end
 end

app/forms/users/apply_authentication_form.rb

@@ -1,7 +1,7 @@
 class Users::ApplyAuthenticationForm
   include ActiveModel::Model
 
-  attr_accessor :name, :id_number, :gender, :upload_image, :attachment_ids
+  attr_accessor :name, :show_realname, :id_number, :gender, :upload_image, :attachment_ids
 
   validates :name, presence: true
   validate :validate_ID_number

app/services/users/apply_authentication_service.rb

@@ -15,6 +15,7 @@ class Users::ApplyAuthenticationService < ApplicationService
     user.lastname  = params[:name].to_s.strip
     user.firstname = ''
     user.ID_number = params[:id_number].to_s.strip.presence
+    user.show_realname = params[:show_realname].to_s == 'true' if params[:show_realname].to_s.present?
 
     ActiveRecord::Base.transaction do
       user.authentication = false

app/views/partners/shared/_partner_managers.html.erb

@@ -4,11 +4,13 @@
 
 <% manager_group.partner_managers.each do |manager| %>
   <div class="partner-manager-item partner-manager-item-<%= manager.id %>">
-    <%= delete_link 'x',
+    <% if !manager_group.admin? || manager.user_id != current_user.id %>
-                    remove_partner_manager_partner_path(current_partner, manager_id: manager.id, element: ".partner-manager-item-#{manager.id}"),
+      <%= delete_link 'x',
-                    data: { toggle: 'tooltip', title: '删除' },
+                      remove_partner_manager_partner_path(current_partner, manager_id: manager.id, element: ".partner-manager-item-#{manager.id}"),
-                    class: 'remove-partner-manager-action' do %>
+                      data: { toggle: 'tooltip', title: '删除' },
-      <i class="fa fa-times-circle"></i>
+                      class: 'remove-partner-manager-action' do %>
+        <i class="fa fa-times-circle"></i>
+      <% end %>
     <% end %>
 
     <%= link_to "/users/#{manager.user.login}", data: { toggle: 'tooltip', title: '查看个人主页' },

public/react/src/modules/user/account/AccountBasicEditItem.js

@@ -4,7 +4,7 @@ import { SnackbarHOC, getImageUrl, City, ConditionToolTip } from 'educoder';
 import { Form, Button, Input, Radio, Select, Tooltip, Icon, AutoComplete  } from 'antd'
 const RadioGroup = Radio.Group;
 const Option = Select.Option;
-class AccpimtBasicEditItem extends Component {
+class AccountBasicEditItem extends Component {
   constructor(props){
     super(props);
   }
@@ -196,4 +196,4 @@ class AccpimtBasicEditItem extends Component {
     )
   }
 }
-export default AccpimtBasicEditItem;
+export default AccountBasicEditItem;

public/react/src/modules/user/modal/RealNameCertificationModal.js

@@ -257,10 +257,10 @@ class RealNameCertificationModal extends Component{
 
   onSendOk = () => {
     this.props.form.validateFieldsAndScroll((err, values) => {
-      console.log(values);
+      // console.log(values);
-      console.log(this.state.department_id);
+      // console.log(this.state.realName);
       if(!err){
-        let{imageUrl2}=this.state;
+        let{imageUrl2,showRealName}=this.state;
         let{current_user,basicInfo}=this.props;
         if(imageUrl2){
           let { certification } = this.props;
@@ -268,9 +268,10 @@ class RealNameCertificationModal extends Component{
             // 实名认证
             let url = `/users/accounts/${current_user && current_user.login}/authentication_apply.json`
             axios.post((url),{
-              name:values.name || basicInfo.name,
+              name:this.state.realName || basicInfo.name,
               gender:parseInt(values.sex),
               id_number:values.credentials,
+              show_realname:showRealName,
               attachment_ids:[this.state.fileID]
             }).then((result)=>{
               if(result){
@@ -692,7 +693,7 @@ class RealNameCertificationModal extends Component{
             </div>
             :
               <AccountBasicEditItem
-                identity={identity}
+                identity={identity} 
                 getFieldDecorator={getFieldDecorator}
                 professionalFlag={professionalFlag}
                 basicInfo={basicInfo}