haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-22 11:57:34 +00:00
Code Issues Releases Wiki Activity

fix admin work weixin email (#5253)

Browse Source
This commit is contained in:
欢乐马
2022-09-03 16:08:53 +08:00
committed by GitHub
parent 363df789c4
commit 84ea5c9243
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/pages/sys-admin/dingtalk/dingtalk-department-members-list.js
View File

@@ -25,7 +25,7 @@ class DingtalkDepartmentMembersList extends Component {
const { newUsersTempObj, checkedDepartmentId, isMembersListLoading, canCheckUserIds } = this.props; const { newUsersTempObj, checkedDepartmentId, isMembersListLoading, canCheckUserIds } = this.props;
const membersList = this.props.membersList.map((member, index) => { const membersList = this.props.membersList.map((member, index) => {
let avatar = member.avatar; let avatar = member.avatar;
if (member.avatar.length > 0) { if (member.avatar && member.avatar.length > 0) {
avatar = member.avatar; avatar = member.avatar;
} else { } else {
avatar = siteRoot + 'media/avatars/default.png'; avatar = siteRoot + 'media/avatars/default.png';

2
frontend/src/pages/sys-admin/work-weixin/work-weixin-department-members-list.js
View File

@@ -25,7 +25,7 @@ class WorkWeixinDepartmentMembersList extends Component {
const { newUsersTempObj, checkedDepartmentId, isMembersListLoading, canCheckUserIds } = this.props; const { newUsersTempObj, checkedDepartmentId, isMembersListLoading, canCheckUserIds } = this.props;
const membersList = this.props.membersList.map((member, index) => { const membersList = this.props.membersList.map((member, index) => {
let avatar = member.avatar; let avatar = member.avatar;
if (member.avatar.length > 0) { if (member.avatar && member.avatar.length > 0) {
avatar = member.avatar.substring(0, member.avatar.length - 1) + '100';// get smaller avatar avatar = member.avatar.substring(0, member.avatar.length - 1) + '100';// get smaller avatar
} else { } else {
avatar = siteRoot + 'media/avatars/default.png'; avatar = siteRoot + 'media/avatars/default.png';

2
seahub/api2/endpoints/admin/dingtalk.py
View File

@@ -379,7 +379,7 @@ class AdminDingtalkDepartmentsImport(APIView):
# import api_user # import api_user
for api_user in api_user_list: for api_user in api_user_list:
uid = api_user.get('unionid', '') uid = api_user.get('unionid', '')
api_user['contact_email'] = api_user.get('email') api_user['contact_email'] = api_user.get('email', '')
api_user_name = api_user.get('name') api_user_name = api_user.get('name')
# determine the user exists # determine the user exists

4
seahub/api2/endpoints/admin/work_weixin.py
View File

@@ -130,7 +130,7 @@ class AdminWorkWeixinDepartmentMembers(APIView):
provider=WORK_WEIXIN_PROVIDER, uid__contains=WORK_WEIXIN_UID_PREFIX) provider=WORK_WEIXIN_PROVIDER, uid__contains=WORK_WEIXIN_UID_PREFIX)
for api_user in api_user_list: for api_user in api_user_list:
uid = WORK_WEIXIN_UID_PREFIX + api_user.get('userid', '') uid = WORK_WEIXIN_UID_PREFIX + api_user.get('userid', '')
api_user['contact_email'] = api_user['email'] api_user['contact_email'] = api_user.get('email', '')
# # determine the user exists # # determine the user exists
if social_auth_queryset.filter(uid=uid).exists(): if social_auth_queryset.filter(uid=uid).exists():
api_user['email'] = social_auth_queryset.get(uid=uid).username api_user['email'] = social_auth_queryset.get(uid=uid).username
@@ -410,7 +410,7 @@ class AdminWorkWeixinDepartmentsImport(APIView):
# import api_user # import api_user
for api_user in api_user_list: for api_user in api_user_list:
uid = WORK_WEIXIN_UID_PREFIX + api_user.get('userid', '') uid = WORK_WEIXIN_UID_PREFIX + api_user.get('userid', '')
api_user['contact_email'] = api_user['email'] api_user['contact_email'] = api_user.get('email', '')
api_user_name = api_user.get('name') api_user_name = api_user.get('name')
# determine the user exists # determine the user exists

4
seahub/work_weixin/views.py
View File

@@ -123,7 +123,7 @@ def work_weixin_oauth_callback(request):
if user_info_api_response_dic: if user_info_api_response_dic:
api_user = user_info_api_response_dic api_user = user_info_api_response_dic
api_user['username'] = email api_user['username'] = email
api_user['contact_email'] = api_user['email'] api_user['contact_email'] = api_user.get('email', '')
update_work_weixin_user_info(api_user) update_work_weixin_user_info(api_user)
if not user.is_active: if not user.is_active:
@@ -217,7 +217,7 @@ def work_weixin_oauth_connect_callback(request):
if user_info_api_response_dic: if user_info_api_response_dic:
api_user = user_info_api_response_dic api_user = user_info_api_response_dic
api_user['username'] = email api_user['username'] = email
api_user['contact_email'] = api_user['email'] api_user['contact_email'] = api_user.get('email', '')
update_work_weixin_user_info(api_user) update_work_weixin_user_info(api_user)
# redirect user to page # redirect user to page