Merge pull request 'zouanp' (#190) from zouanp into V20210731.patch

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

routers/repo/attachment.go

@@ -152,15 +152,15 @@ func DownloadUserIsOrg(ctx *context.Context, attach *models.Attachment) bool {
 		} else {
 			repo.GetOwner()
 			if repo.Owner.IsOrganization() {
-				log.Info("ower is org.")
+				//log.Info("ower is org.")
 				if repo.Owner.IsUserPartOfOrg(ctx.User.ID) {
-					log.Info("user may be visit the attach.")
-					return false
+					log.Info("user may visit the attach.")
+					return true
 				}
 			}
 		}
 	}
-	return true
+	return false
 }
 
 // GetAttachment serve attachements
@@ -190,7 +190,7 @@ func GetAttachment(ctx *context.Context) {
 
 	if repository == nil { //If not linked
 		//if !(ctx.IsSigned && attach.UploaderID == ctx.User.ID) && attach.IsPrivate { //We block if not the uploader
-		if !(ctx.IsSigned && attach.UploaderID == ctx.User.ID) && DownloadUserIsOrg(ctx, attach) { //We block if not the uploader
+		if !(ctx.IsSigned && attach.UploaderID == ctx.User.ID) && !DownloadUserIsOrg(ctx, attach) { //We block if not the uploader
 			ctx.Error(http.StatusNotFound)
 			return
 		}

routers/repo/dataset.go

@@ -22,20 +22,6 @@ func MustEnableDataset(ctx *context.Context) {
 	}
 }
 
-func filterPrivateAttachments(ctx *context.Context, list []*models.Attachment) []*models.Attachment {
-	if ctx.Repo.CanWrite(models.UnitTypeDatasets) {
-		return list
-	} else {
-		var publicList []*models.Attachment
-		for _, attach := range list {
-			if !attach.IsPrivate {
-				publicList = append(publicList, attach)
-			}
-		}
-		return publicList
-	}
-}
-
 func newFilterPrivateAttachments(ctx *context.Context, list []*models.Attachment, repo *models.Repository) []*models.Attachment {
 
 	if ctx.Repo.CanWrite(models.UnitTypeDatasets) {