mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-20 19:08:21 +00:00
add image deletion button on table view image previewer (#7475)
* add image deletion button on table view image previewer * optimize * check permission before delete image * optimize --------- Co-authored-by: zhouwenxuan <aries@Mac.local>
This commit is contained in:
@@ -859,13 +859,16 @@ class DirentGridView extends React.Component {
|
||||
let direntPath = Utils.joinPath(path, dirent.name);
|
||||
|
||||
let canModifyFile = false;
|
||||
let canDeleteFile = false;
|
||||
if (['rw', 'cloud-edit'].indexOf(userPerm) != -1) {
|
||||
canModifyFile = true;
|
||||
canDeleteFile = true;
|
||||
} else {
|
||||
const { isCustomPermission, customPermission } = Utils.getUserPermission(userPerm);
|
||||
if (isCustomPermission) {
|
||||
const { modify } = customPermission.permission;
|
||||
const { modify, delete: canDelete } = customPermission.permission;
|
||||
canModifyFile = modify;
|
||||
canDeleteFile = canDelete;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1044,7 +1047,7 @@ class DirentGridView extends React.Component {
|
||||
closeImagePopup={this.closeImagePopup}
|
||||
moveToPrevImage={this.moveToPrevImage}
|
||||
moveToNextImage={this.moveToNextImage}
|
||||
onDeleteImage={this.deleteImage}
|
||||
onDeleteImage={(canDeleteFile && this.deleteImage) ? this.deleteImage : null}
|
||||
onRotateImage={this.rotateImage}
|
||||
enableRotate={canModifyFile}
|
||||
/>
|
||||
|
@@ -764,13 +764,16 @@ class DirentListView extends React.Component {
|
||||
const isDesktop = Utils.isDesktop();
|
||||
|
||||
let canModifyFile = false;
|
||||
let canDeleteFile = false;
|
||||
if (['rw', 'cloud-edit'].indexOf(userPerm) != -1) {
|
||||
canModifyFile = true;
|
||||
canDeleteFile = true;
|
||||
} else {
|
||||
const { isCustomPermission, customPermission } = Utils.getUserPermission(userPerm);
|
||||
if (isCustomPermission) {
|
||||
const { modify } = customPermission.permission;
|
||||
const { modify, delete: canDelete } = customPermission.permission;
|
||||
canModifyFile = modify;
|
||||
canDeleteFile = canDelete;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -874,7 +877,7 @@ class DirentListView extends React.Component {
|
||||
closeImagePopup={this.closeImagePopup}
|
||||
moveToPrevImage={this.moveToPrevImage}
|
||||
moveToNextImage={this.moveToNextImage}
|
||||
onDeleteImage={this.deleteImage}
|
||||
onDeleteImage={(canDeleteFile && this.deleteImage) ? this.deleteImage : null}
|
||||
onRotateImage={this.rotateImage}
|
||||
enableRotate={canModifyFile}
|
||||
/>
|
||||
|
Reference in New Issue
Block a user