Merge branch 'DEV-dataset-in-project' of git.pcl.ac.cn:yoyoyard/opendata into DEV-dataset-in-project

routers/repo/dataset.go

@@ -22,6 +22,21 @@ 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 DatasetIndex(ctx *context.Context) {
 	MustEnableDataset(ctx)
 
@@ -37,7 +52,7 @@ func DatasetIndex(ctx *context.Context) {
 		ctx.ServerError("GetDatasetAttachments", err)
 		return
 	}
-	attachments := dataset.Attachments
+	attachments := filterPrivateAttachments(ctx, dataset.Attachments)
 
 	ctx.Data["SortType"] = ctx.Query("sort")
 	switch ctx.Query("sort") {

routers/routes/routes.go

@@ -764,10 +764,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Post("/status", reqRepoIssuesOrPullsWriter, repo.UpdateIssueStatus)
 			m.Post("/resolve_conversation", reqRepoIssuesOrPullsReader, repo.UpdateResolveConversation)
 		}, context.RepoMustNotBeArchived())
-		m.Group("/datasets", func() {
-			m.Get("", reqRepoDatasetReader, repo.DatasetIndex)
-			m.Post("", reqRepoDatasetWriter, bindIgnErr(auth.EditDatasetForm{}), repo.EditDatasetPost)
-		}, context.RepoMustNotBeArchived())
 		m.Group("/comments/:id", func() {
 			m.Post("", repo.UpdateCommentContent)
 			m.Post("/delete", repo.DeleteComment)
@@ -866,6 +862,11 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Get("/milestones", reqRepoIssuesOrPullsReader, repo.Milestones)
 		}, context.RepoRef())
 
+		m.Group("/datasets", func() {
+			m.Get("", reqRepoDatasetReader, repo.DatasetIndex)
+			m.Post("", reqRepoDatasetWriter, bindIgnErr(auth.EditDatasetForm{}), repo.EditDatasetPost)
+		}, context.RepoRef())
+
 		m.Group("/wiki", func() {
 			m.Get("/?:page", repo.Wiki)
 			m.Get("/_pages", repo.WikiPages)