From adb96983dba036633283aff7d58bd672f4473ef0 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 15 Nov 2019 17:51:10 +0800 Subject: [PATCH] user apply add laboratory flag --- app/models/user.rb | 4 ++++ .../admins/identity_authentications/shared/_list.html.erb | 3 +++ .../admins/professional_authentications/shared/_list.html.erb | 3 +++ 3 files changed, 10 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index c2a7317e7..aa02ecb4c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -695,6 +695,10 @@ class User < ApplicationRecord LimitForbidControl::UserLogin.new(self).clear end + def from_sub_site? + laboratory_id.present? && laboratory_id != 1 + end + protected def validate_password_length # 管理员的初始密码是5位 diff --git a/app/views/admins/identity_authentications/shared/_list.html.erb b/app/views/admins/identity_authentications/shared/_list.html.erb index e1c603215..607feb93a 100644 --- a/app/views/admins/identity_authentications/shared/_list.html.erb +++ b/app/views/admins/identity_authentications/shared/_list.html.erb @@ -43,6 +43,9 @@ <%= link_to "/users/#{user.login}", class: 'identity-authentication-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %> <% end %> + <% if user.from_sub_site? %> + 合作 + <% end %> <%= user.real_name %> <%= user.ID_number %> diff --git a/app/views/admins/professional_authentications/shared/_list.html.erb b/app/views/admins/professional_authentications/shared/_list.html.erb index 0bf8ea4a3..6ec6355ba 100644 --- a/app/views/admins/professional_authentications/shared/_list.html.erb +++ b/app/views/admins/professional_authentications/shared/_list.html.erb @@ -41,6 +41,9 @@ <%= link_to "/users/#{user.login}", class: 'professional-authentication-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %> <% end %> + <% if user.from_sub_site? %> + 合作 + <% end %> <%= user.real_name %> <%= raw [user.school_name.presence, user.department_name.presence].compact.join('
') %>