From 4e3e88c8ff4d9b532f392a138ce86db9fa1ea5dc Mon Sep 17 00:00:00 2001
From: OpenIhu <hujl@pcl.ac.cn>
Date: Wed, 15 Sep 2021 11:28:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=9C=A8=E7=94=A8=E6=88=B7=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E9=9A=90=E8=97=8F=E7=83=AD=E9=97=A8?=
 =?UTF-8?q?=E5=8F=8A=E6=B4=BB=E8=B7=83Tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/explore/repo_list.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
index decce4fbe..79c301ef7 100755
--- a/templates/explore/repo_list.tmpl
+++ b/templates/explore/repo_list.tmpl
@@ -39,6 +39,7 @@
 </style>
 
 <div class="ui secondary pointing tabular top attached borderless menu navbar">
+	{{if .IsLandingPageExplore}}
 	<a class="{{if eq .SortType "hot"}}active{{end}} item" href="{{$.Link}}?sort=hot&q={{$.Keyword}}&tab={{$.TabName}}">
 		<svg class="svg octicon-repo" width="16" height="16" aria-hidden="true">
 			<use xlink:href="#octicon-repo" />
@@ -51,7 +52,7 @@
 		</svg> 
 		活跃{{.i18n.Tr "explore.repos"}}
 	</a>
-
+	{{end}}
 	<a class="{{if eq .SortType "recentupdate"}}active{{end}} item" href="{{$.Link}}?sort=recentupdate&q={{$.Keyword}}&tab={{$.TabName}}">
 		<svg class="svg octicon-organization" width="16" height="16" aria-hidden="true">
 			<use xlink:href="#octicon-organization" />

From 5b5cfa8abd74e9f2ffc1982fa5994ad5b7841c04 Mon Sep 17 00:00:00 2001
From: OpenIhu <hujl@pcl.ac.cn>
Date: Wed, 15 Sep 2021 14:47:15 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BB=85=E5=9C=A8explore?=
 =?UTF-8?q?=E4=B8=8B=E6=98=BE=E7=A4=BA=E7=83=AD=E9=97=A8=E5=92=8C=E6=B4=BB?=
 =?UTF-8?q?=E8=B7=83=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/explore/repo_list.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
index 79c301ef7..a9eaaaccf 100755
--- a/templates/explore/repo_list.tmpl
+++ b/templates/explore/repo_list.tmpl
@@ -39,7 +39,7 @@
 </style>
 
 <div class="ui secondary pointing tabular top attached borderless menu navbar">
-	{{if .IsLandingPageExplore}}
+	{{if .PageIsExplore}}
 	<a class="{{if eq .SortType "hot"}}active{{end}} item" href="{{$.Link}}?sort=hot&q={{$.Keyword}}&tab={{$.TabName}}">
 		<svg class="svg octicon-repo" width="16" height="16" aria-hidden="true">
 			<use xlink:href="#octicon-repo" />

From e6984977130dbc0b2729a38dc681f020748d831e Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Thu, 23 Sep 2021 15:50:08 +0800
Subject: [PATCH 3/4] permission to del dataset

---
 models/attachment.go                      | 27 +++++++++++++++++++++++++++
 models/dataset.go                         |  7 ++++---
 routers/repo/attachment.go                |  6 ++++--
 routers/repo/dataset.go                   |  4 ++--
 templates/repo/datasets/dataset_list.tmpl |  4 ++--
 5 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/models/attachment.go b/models/attachment.go
index fdd26b8ab..418d7c881 100755
--- a/models/attachment.go
+++ b/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
+}
diff --git a/models/dataset.go b/models/dataset.go
index f4713d77b..e7160006d 100755
--- a/models/dataset.go
+++ b/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)
 	}
 
diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index c62a7b215..a8b2c8fbe 100755
--- a/routers/repo/attachment.go
+++ b/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{
diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go
index 7ada76d88..7d59ab486 100755
--- a/routers/repo/dataset.go
+++ b/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
diff --git a/templates/repo/datasets/dataset_list.tmpl b/templates/repo/datasets/dataset_list.tmpl
index 3c7f0b3ce..639028d65 100755
--- a/templates/repo/datasets/dataset_list.tmpl
+++ b/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}}

From de13787e41f67175de9ff5f72a13f294b5082033 Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Thu, 23 Sep 2021 16:21:02 +0800
Subject: [PATCH 4/4] mod job detail

---
 templates/repo/cloudbrain/show.tmpl | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl
index fe4ec7ab3..842f629c9 100755
--- a/templates/repo/cloudbrain/show.tmpl
+++ b/templates/repo/cloudbrain/show.tmpl
@@ -24,22 +24,6 @@
                   <td class="four wide"> 状态 </td>
                   <td> {{.State}} </td>
                 </tr>
-                <tr>
-                  <td> 开始时间 </td>
-                  <td>{{.StartTime}}</td>
-                </tr>
-                <tr>
-                  <td> 结束时间 </td>
-                  <td>{{.FinishedTime}}</td>
-                </tr>
-                <tr>
-                  <td> ExitCode </td>
-                  <td>{{.ExitCode}}</td>
-                </tr>
-                <tr>
-                  <td> 退出信息 </td>
-                  <td>{{.ExitDiagnostics| nl2br}}</td>
-                </tr>
               </tbody>
             </table>
                 {{end}}
@@ -73,7 +57,7 @@
               </thead>
               <tbody>
                 <tr>
-                  <td class="four wide"> 状态 </td>
+                  <td class="four wide"> 平台 </td>
                   <td> {{.Platform}} </td>
                 </tr>
                 <tr>