From d6c67cfec3d0627780d76fa662f3ae7285a57ebd Mon Sep 17 00:00:00 2001 From: lian Date: Tue, 18 Oct 2022 09:56:40 +0800 Subject: [PATCH 1/3] update .github/workflows/dist.yml --- .github/workflows/dist.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index 6c14f0802a..07b9fcb7f3 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -4,7 +4,7 @@ on: push: branches: - master - - "8.0" + - "9.0" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 1a63ee1f3d3f66e6cbad72276981afbc07f0d3f6 Mon Sep 17 00:00:00 2001 From: lian Date: Wed, 19 Oct 2022 19:08:02 +0800 Subject: [PATCH 2/3] update UI bug when org admin add/delete/update user (#5286) Co-authored-by: lian --- frontend/src/pages/org-admin/org-user-item.js | 28 ++++--------------- .../src/pages/org-admin/org-users-list.js | 2 ++ .../src/pages/org-admin/org-users-users.js | 17 +++++++++++ seahub/organizations/api/admin/users.py | 3 ++ 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/frontend/src/pages/org-admin/org-user-item.js b/frontend/src/pages/org-admin/org-user-item.js index 847a8738c1..4036337b50 100644 --- a/frontend/src/pages/org-admin/org-user-item.js +++ b/frontend/src/pages/org-admin/org-user-item.js @@ -76,28 +76,12 @@ class UserItem extends React.Component { this.props.toggleRevokeAdmin(email); } - changeStatus = (st) => { - let isActive; - if (st == 'active') { - isActive = 'true'; - } else { - isActive = 'false'; + changeStatus = (value) => { + const isActive = value == 'active'; + if (isActive) { + toaster.notify(gettext('It may take some time, please wait.')); } - - seafileAPI.orgAdminChangeOrgUserStatus(orgID, this.props.user.email, isActive).then(res => { - this.setState({ - currentStatus: isActive == 'true' ? 'active' : 'inactive', - highlight: false, - showMenu: false, - }); - toaster.success(gettext('Edit succeeded.')); - }).catch(error => { - let errMessage = Utils.getErrorMsg(error); - if (errMessage === gettext('Error')) { - errMessage = gettext('Edit failed.'); - } - toaster.danger(errMessage); - }); + this.props.changeStatus(this.props.user.email, isActive); } onDropdownToggleClick = (e) => { @@ -147,7 +131,7 @@ class UserItem extends React.Component { diff --git a/frontend/src/pages/org-admin/org-users-list.js b/frontend/src/pages/org-admin/org-users-list.js index 5c0994abb1..fcff10e9ce 100644 --- a/frontend/src/pages/org-admin/org-users-list.js +++ b/frontend/src/pages/org-admin/org-users-list.js @@ -6,6 +6,7 @@ import UserItem from './org-user-item'; const propTypes = { initOrgUsersData: PropTypes.func.isRequired, toggleDelete: PropTypes.func.isRequired, + changeStatus: PropTypes.func.isRequired, orgUsers: PropTypes.array.isRequired, page: PropTypes.number.isRequired, pageNext: PropTypes.bool.isRequired, @@ -79,6 +80,7 @@ class OrgUsersList extends React.Component { currentTab="users" isItemFreezed={this.state.isItemFreezed} toggleDelete={this.props.toggleDelete} + changeStatus={this.props.changeStatus} onFreezedItem={this.onFreezedItem} onUnfreezedItem={this.onUnfreezedItem} /> diff --git a/frontend/src/pages/org-admin/org-users-users.js b/frontend/src/pages/org-admin/org-users-users.js index 26a2a44619..4677fb0765 100644 --- a/frontend/src/pages/org-admin/org-users-users.js +++ b/frontend/src/pages/org-admin/org-users-users.js @@ -166,6 +166,22 @@ class OrgUsers extends Component { }); } + changeStatus= (email, isActive) => { + seafileAPI.orgAdminChangeOrgUserStatus(orgID, email, isActive).then(res => { + let users = this.state.orgUsers.map(item => { + if (item.email == email) { + item['is_active']= res.data['is_active']; + } + return item; + }); + this.setState({orgUsers: users}); + toaster.success(gettext('Edit succeeded.')); + }).catch(error => { + let errMessage = Utils.getErrorMsg(error); + toaster.danger(errMessage); + }); + } + searchItems = (keyword) => { navigate(`${siteRoot}org/useradmin/search-users/?query=${encodeURIComponent(keyword)}`); } @@ -210,6 +226,7 @@ class OrgUsers extends Component { Date: Thu, 20 Oct 2022 22:32:01 +0800 Subject: [PATCH 3/3] fix share link can not convert office file (#5289) --- seahub/views/file.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/seahub/views/file.py b/seahub/views/file.py index 7b3fea4f6c..bd483004b8 100644 --- a/seahub/views/file.py +++ b/seahub/views/file.py @@ -975,9 +975,9 @@ def view_history_file_common(request, repo_id, ret_dict): if is_textual_file(file_type=filetype): handle_textual_file(request, filetype, inner_path, ret_dict) elif filetype == DOCUMENT: - handle_document(inner_path, obj_id, fileext, ret_dict) + handle_document(raw_path, obj_id, fileext, ret_dict) elif filetype == SPREADSHEET: - handle_spreadsheet(inner_path, obj_id, fileext, ret_dict) + handle_spreadsheet(raw_path, obj_id, fileext, ret_dict) else: pass else: @@ -1271,9 +1271,9 @@ def view_shared_file(request, fileshare): if is_textual_file(file_type=filetype): handle_textual_file(request, filetype, inner_path, ret_dict) elif filetype == DOCUMENT: - handle_document(inner_path, obj_id, fileext, ret_dict) + handle_document(raw_path, obj_id, fileext, ret_dict) elif filetype == SPREADSHEET: - handle_spreadsheet(inner_path, obj_id, fileext, ret_dict) + handle_spreadsheet(raw_path, obj_id, fileext, ret_dict) elif filetype == XMIND: xmind_image_path = get_thumbnail_image_path(obj_id, XMIND_IMAGE_SIZE) if not os.path.exists(xmind_image_path) and not extract_xmind_image(repo_id, path)[0]: @@ -1470,9 +1470,9 @@ def view_file_via_shared_dir(request, fileshare): if is_textual_file(file_type=filetype): handle_textual_file(request, filetype, inner_path, ret_dict) elif filetype == DOCUMENT: - handle_document(inner_path, obj_id, fileext, ret_dict) + handle_document(raw_path, obj_id, fileext, ret_dict) elif filetype == SPREADSHEET: - handle_spreadsheet(inner_path, obj_id, fileext, ret_dict) + handle_spreadsheet(raw_path, obj_id, fileext, ret_dict) elif filetype == IMAGE: current_commit = get_commits(repo_id, 0, 1)[0] real_parent_dir = os.path.dirname(real_path)