Merge pull request '对不能删除数据集的用户应隐藏删除按钮' (#439) from del-dataset into V20210927

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/439

models/attachment.go

@@ -46,6 +46,7 @@ type Attachment struct {
 	CreatedUnix     timeutil.TimeStamp `xorm:"created"`
 
 	FileChunk *FileChunk `xorm:"-"`
+	CanDel    bool       `xorm:"-"`
 }
 
 type AttachmentUsername struct {
@@ -437,3 +438,29 @@ func getModelArtsUserAttachments(e Engine, userID int64) ([]*AttachmentUsername,
 func GetModelArtsUserAttachments(userID int64) ([]*AttachmentUsername, error) {
 	return getModelArtsUserAttachments(x, userID)
 }
+
+func CanDelAttachment(isSigned bool, user *User, attach *Attachment) bool {
+	if !isSigned {
+		return false
+	}
+	dataset, err := GetDatasetByID(attach.DatasetID)
+	if err != nil {
+		log.Error("GetDatasetByID failed:%v", err.Error())
+		return false
+	}
+	repo, _ := GetRepositoryByID(dataset.RepoID)
+	if err != nil {
+		log.Error("GetRepositoryByID failed:%v", err.Error())
+		return false
+	}
+	permission, _ := GetUserRepoPermission(repo, user)
+	if err != nil {
+		log.Error("GetUserRepoPermission failed:%v", err.Error())
+		return false
+	}
+
+	if user.ID == attach.UploaderID || user.IsAdmin || permission.AccessMode >= AccessModeAdmin {
+		return true
+	}
+	return false
+}

models/dataset.go

@@ -196,11 +196,11 @@ func (s datasetMetaSearch) Less(i, j int) bool {
 	return s.ID[i] < s.ID[j]
 }
 
-func GetDatasetAttachments(typeCloudBrain int, rels ...*Dataset) (err error) {
-	return getDatasetAttachments(x, typeCloudBrain, rels...)
+func GetDatasetAttachments(typeCloudBrain int, isSigned bool, user *User, rels ...*Dataset) (err error) {
+	return getDatasetAttachments(x, typeCloudBrain, isSigned, user, rels...)
 }
 
-func getDatasetAttachments(e Engine, typeCloudBrain int, rels ...*Dataset) (err error) {
+func getDatasetAttachments(e Engine, typeCloudBrain int, isSigned bool, user *User, rels ...*Dataset) (err error) {
 	if len(rels) == 0 {
 		return
 	}
@@ -243,6 +243,7 @@ func getDatasetAttachments(e Engine, typeCloudBrain int, rels ...*Dataset) (err
 			return err
 		}
 		attachment.FileChunk = fileChunks[0]
+		attachment.CanDel = CanDelAttachment(isSigned, user, attachment)
 		sortedRels.Rel[currentIndex].Attachments = append(sortedRels.Rel[currentIndex].Attachments, attachment)
 	}
 

routers/repo/attachment.go

@@ -128,7 +128,9 @@ func DeleteAttachment(ctx *context.Context) {
 		ctx.Error(400, err.Error())
 		return
 	}
-	if !ctx.IsSigned || (ctx.User.ID != attach.UploaderID) {
+
+	//issue 214: mod del-dataset permission
+	if !models.CanDelAttachment(ctx.IsSigned, ctx.User, attach) {
 		ctx.Error(403)
 		return
 	}
@@ -146,7 +148,7 @@ func DeleteAttachment(ctx *context.Context) {
 
 	_, err = models.DeleteFileChunkById(attach.UUID)
 	if err != nil {
-		ctx.Error(500, fmt.Sprintf("DeleteAttachment: %v", err))
+		ctx.Error(500, fmt.Sprintf("DeleteFileChunkById: %v", err))
 		return
 	}
 	ctx.JSON(200, map[string]string{

routers/repo/dataset.go

@@ -76,7 +76,7 @@ func QueryDataSet(ctx *context.Context) []*models.Attachment {
 		ctx.NotFound("type error", nil)
 		return nil
 	}
-	err = models.GetDatasetAttachments(ctx.QueryInt("type"), dataset)
+	err = models.GetDatasetAttachments(ctx.QueryInt("type"), ctx.IsSigned, ctx.User, dataset)
 	if err != nil {
 		ctx.ServerError("GetDatasetAttachments", err)
 		return nil
@@ -120,7 +120,7 @@ func DatasetIndex(ctx *context.Context) {
 		ctx.NotFound("type error", nil)
 		return
 	}
-	err = models.GetDatasetAttachments(ctx.QueryInt("type"), dataset)
+	err = models.GetDatasetAttachments(ctx.QueryInt("type"), ctx.IsSigned, ctx.User, dataset)
 	if err != nil {
 		ctx.ServerError("GetDatasetAttachments", err)
 		return

templates/repo/datasets/dataset_list.tmpl

@@ -31,7 +31,7 @@
         </div>
       {{end}}
       {{if $.Permission.CanWrite $.UnitTypeDatasets}}
-        {{if  $.Repository.IsPrivate}}
+        {{if  (not .CanDel) or $.Repository.IsPrivate}}
           <div class="two wide column">
             <a class="ui button mini" disabled='true' data-tooltip='{{$.i18n.Tr "dataset.how_to_public"}}'>{{$.i18n.Tr "dataset.private"}}</a>
           </div>
@@ -45,7 +45,7 @@
           </div>
         {{end}}
 
-        <div class="two wide column right aligned">
+        <div class="two wide column right aligned" style="{{if not .CanDel}}visibility: hidden;{{end}}">
           <a class="ui red button mini" href="javascript:void(0)" data-uuid={{.UUID}} data-dataset-delete data-remove-url="{{AppSubUrl}}/attachments/delete" data-csrf="{{$.CsrfToken}}">{{$.i18n.Tr "dataset.delete"}}</a>
         </div>
       {{end}}