From d32ac609bf2a5a96189e4071b0b96455b179adb1 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Mon, 11 Nov 2019 16:14:41 +0800 Subject: [PATCH 1/3] user manager: apply auth api add show realname column --- app/controllers/users/authentication_applies_controller.rb | 2 +- app/forms/users/apply_authentication_form.rb | 2 +- app/services/users/apply_authentication_service.rb | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/users/authentication_applies_controller.rb b/app/controllers/users/authentication_applies_controller.rb index 183df2f65..3c43be553 100644 --- a/app/controllers/users/authentication_applies_controller.rb +++ b/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 \ No newline at end of file diff --git a/app/forms/users/apply_authentication_form.rb b/app/forms/users/apply_authentication_form.rb index a9cb60eec..e0e7931b1 100644 --- a/app/forms/users/apply_authentication_form.rb +++ b/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 diff --git a/app/services/users/apply_authentication_service.rb b/app/services/users/apply_authentication_service.rb index cab76b45c..1b9b02c91 100644 --- a/app/services/users/apply_authentication_service.rb +++ b/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 From 006380037cae95f318ed712a79e842bdf19cd701 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Mon, 11 Nov 2019 16:22:19 +0800 Subject: [PATCH 2/3] partner customer manager: add some check --- app/controllers/partners_controller.rb | 4 ++++ app/views/partners/shared/_partner_managers.html.erb | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/controllers/partners_controller.rb b/app/controllers/partners_controller.rb index b2f8abc4c..7875e1780 100644 --- a/app/controllers/partners_controller.rb +++ b/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 diff --git a/app/views/partners/shared/_partner_managers.html.erb b/app/views/partners/shared/_partner_managers.html.erb index 3896d70ed..7ad98d0b9 100644 --- a/app/views/partners/shared/_partner_managers.html.erb +++ b/app/views/partners/shared/_partner_managers.html.erb @@ -4,11 +4,13 @@ <% manager_group.partner_managers.each do |manager| %>
- <%= delete_link 'x', - remove_partner_manager_partner_path(current_partner, manager_id: manager.id, element: ".partner-manager-item-#{manager.id}"), - data: { toggle: 'tooltip', title: '删除' }, - class: 'remove-partner-manager-action' do %> - + <% if !manager_group.admin? || manager.user_id != current_user.id %> + <%= delete_link 'x', + remove_partner_manager_partner_path(current_partner, manager_id: manager.id, element: ".partner-manager-item-#{manager.id}"), + data: { toggle: 'tooltip', title: '删除' }, + class: 'remove-partner-manager-action' do %> + + <% end %> <% end %> <%= link_to "/users/#{manager.user.login}", data: { toggle: 'tooltip', title: '查看个人主页' }, From 29a533da0a23e5d1a20c22dc259d1a9337896aca Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 11 Nov 2019 16:24:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/user/account/AccountBasicEditItem.js | 4 ++-- .../modules/user/modal/RealNameCertificationModal.js | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/user/account/AccountBasicEditItem.js b/public/react/src/modules/user/account/AccountBasicEditItem.js index 28988ebf3..3190b2221 100644 --- a/public/react/src/modules/user/account/AccountBasicEditItem.js +++ b/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; \ No newline at end of file +export default AccountBasicEditItem; \ No newline at end of file diff --git a/public/react/src/modules/user/modal/RealNameCertificationModal.js b/public/react/src/modules/user/modal/RealNameCertificationModal.js index 8309cc5ca..17220aa4e 100644 --- a/public/react/src/modules/user/modal/RealNameCertificationModal.js +++ b/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(this.state.department_id); + // console.log(values); + // 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{
: