提交代码

models/attachment.go

@@ -347,6 +347,18 @@ func DeleteAttachmentsByComment(commentID int64, remove bool) (int, error) {
 func UpdateAttachment(atta *Attachment) error {
 	return updateAttachment(x, atta)
 }
+func UpdateAttachmentDescription(atta *Attachment) error {
+	return updateAttachmentDescription(x, atta)
+}
+
+func updateAttachmentDescription(e Engine, atta *Attachment) error {
+	var sess *xorm.Session
+
+	sess = e.ID(atta.ID)
+
+	_, err := sess.Cols("description").Update(atta)
+	return err
+}
 
 func updateAttachment(e Engine, atta *Attachment) error {
 	var sess *xorm.Session
@@ -356,7 +368,7 @@ func updateAttachment(e Engine, atta *Attachment) error {
 		// Use uuid only if id is not set and uuid is set
 		sess = e.Where("uuid = ?", atta.UUID)
 	}
-	_, err := sess.Cols("name", "description", "issue_id", "release_id", "comment_id", "download_count", "is_private", "decompress_state").Update(atta)
+	_, err := sess.Cols("name", "issue_id", "release_id", "comment_id", "download_count", "is_private", "decompress_state").Update(atta)
 	return err
 }
 

routers/repo/attachment.go

@@ -88,7 +88,9 @@ func EditAttachmentUI(ctx *context.Context) {
 	if attachment == nil {
 		ctx.Error(404, "The attachment does not exits.")
 	}
-
+	dataset, _ := models.GetDatasetByID(attachment.DatasetID)
+	r, _ := models.GetRepositoryByID(dataset.RepoID)
+	ctx.Data["Repo"] = r
 	ctx.Data["Attachment"] = attachment
 	ctx.HTML(200, tplAttachmentEdit)
 
@@ -96,7 +98,7 @@ func EditAttachmentUI(ctx *context.Context) {
 
 func EditAttachment(ctx *context.Context, form auth.EditAttachmentForm) {
 
-	err := models.UpdateAttachment(&models.Attachment{
+	err := models.UpdateAttachmentDescription(&models.Attachment{
 		ID:          form.ID,
 		Description: form.Description,
 	})

routers/repo/dataset.go.bak

@@ -1,464 +0,0 @@
-package repo
-
-import (
-	"encoding/json"
-	"net/http"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-
-	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/auth"
-	"code.gitea.io/gitea/modules/base"
-	"code.gitea.io/gitea/modules/context"
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/setting"
-)
-
-const (
-	tplIndex         base.TplName = "repo/datasets/index"
-	tplDatasetCreate base.TplName = "repo/datasets/create"
-	tplDatasetEdit   base.TplName = "repo/datasets/edit"
-	taskstplIndex    base.TplName = "repo/datasets/tasks/index"
-)
-
-var titlePattern = regexp.MustCompile(`^[A-Za-z0-9-_\\.]{1,100}$`)
-
-// MustEnableDataset check if repository enable internal dataset
-func MustEnableDataset(ctx *context.Context) {
-	if !ctx.Repo.CanRead(models.UnitTypeDatasets) {
-		ctx.NotFound("MustEnableDataset", nil)
-		return
-	}
-}
-
-func newFilterPrivateAttachments(ctx *context.Context, list []*models.Attachment, repo *models.Repository) []*models.Attachment {
-
-	if ctx.Repo.CanWrite(models.UnitTypeDatasets) {
-		log.Info("can write.")
-		return list
-	} else {
-		if repo.Owner == nil {
-			repo.GetOwner()
-		}
-		permission := false
-		if repo.Owner.IsOrganization() && ctx.User != nil {
-			if repo.Owner.IsUserPartOfOrg(ctx.User.ID) {
-				log.Info("user is member of org.")
-				permission = true
-			}
-		}
-		if !permission && ctx.User != nil {
-			isCollaborator, _ := repo.IsCollaborator(ctx.User.ID)
-			if isCollaborator {
-				log.Info("Collaborator user may visit the attach.")
-				permission = true
-			}
-		}
-
-		var publicList []*models.Attachment
-		for _, attach := range list {
-			if !attach.IsPrivate {
-				publicList = append(publicList, attach)
-			} else {
-				if permission {
-					publicList = append(publicList, attach)
-				}
-			}
-		}
-		return publicList
-	}
-}
-
-func QueryDataSet(ctx *context.Context) []*models.Attachment {
-	repo := ctx.Repo.Repository
-
-	dataset, err := models.GetDatasetByRepo(repo)
-	if err != nil {
-		log.Error("zou  not found dataset 1")
-		ctx.NotFound("GetDatasetByRepo", err)
-		return nil
-	}
-
-	if ctx.Query("type") == "" {
-		log.Error("zou  not found  type 2")
-		ctx.NotFound("type error", nil)
-		return nil
-	}
-	err = models.GetDatasetAttachments(ctx.QueryInt("type"), ctx.IsSigned, ctx.User, dataset)
-	if err != nil {
-		ctx.ServerError("GetDatasetAttachments", err)
-		return nil
-	}
-	attachments := newFilterPrivateAttachments(ctx, dataset.Attachments, repo)
-
-	ctx.Data["SortType"] = ctx.Query("sort")
-
-	sort.Slice(attachments, func(i, j int) bool {
-		return attachments[i].CreatedUnix > attachments[j].CreatedUnix
-	})
-
-	return attachments
-}
-
-func DatasetIndex(ctx *context.Context) {
-	log.Info("dataset index 1")
-	MustEnableDataset(ctx)
-
-	repo := ctx.Repo.Repository
-
-	dataset, err := models.GetDatasetByRepo(repo)
-	if err != nil {
-		log.Warn("query dataset, not found.")
-		ctx.HTML(200, tplIndex)
-		return
-	}
-	cloudbrainType := -1
-	if ctx.Query("type") != "" {
-
-		cloudbrainType = ctx.QueryInt("type")
-	}
-	err = models.GetDatasetAttachments(cloudbrainType, ctx.IsSigned, ctx.User, dataset)
-	if err != nil {
-		ctx.ServerError("GetDatasetAttachments", err)
-		return
-	}
-
-	attachments := newFilterPrivateAttachments(ctx, dataset.Attachments, repo)
-
-	sort.Slice(attachments, func(i, j int) bool {
-		return attachments[i].CreatedUnix > attachments[j].CreatedUnix
-	})
-
-	page := ctx.QueryInt("page")
-	if page <= 0 {
-		page = 1
-	}
-	pagesize := ctx.QueryInt("pagesize")
-	if pagesize <= 0 {
-		pagesize = 10
-	}
-	pager := context.NewPagination(len(attachments), pagesize, page, 5)
-
-	pageAttachments := getPageAttachments(attachments, page, pagesize)
-
-	//load attachment creator
-	for _, attachment := range pageAttachments {
-		uploader, _ := models.GetUserByID(attachment.UploaderID)
-		attachment.Uploader = uploader
-	}
-
-	ctx.Data["Page"] = pager
-	ctx.Data["PageIsDataset"] = true
-	ctx.Data["Title"] = ctx.Tr("dataset.show_dataset")
-	ctx.Data["Link"] = ctx.Repo.RepoLink + "/datasets"
-	ctx.Data["dataset"] = dataset
-	ctx.Data["Attachments"] = pageAttachments
-	ctx.Data["IsOwner"] = true
-	ctx.Data["StoreType"] = setting.Attachment.StoreType
-	ctx.Data["Type"] = cloudbrainType
-
-	renderAttachmentSettings(ctx)
-
-	ctx.HTML(200, tplIndex)
-}
-
-func getPageAttachments(attachments []*models.Attachment, page int, pagesize int) []*models.Attachment {
-	begin := (page - 1) * pagesize
-	end := (page) * pagesize
-
-	if begin > len(attachments)-1 {
-		return nil
-	}
-	if end > len(attachments)-1 {
-		return attachments[begin:]
-	} else {
-		return attachments[begin:end]
-	}
-
-}
-
-func CreateDataset(ctx *context.Context) {
-
-	MustEnableDataset(ctx)
-
-	ctx.HTML(200, tplDatasetCreate)
-}
-
-func EditDataset(ctx *context.Context) {
-
-	MustEnableDataset(ctx)
-	datasetId, _ := strconv.ParseInt(ctx.Params(":id"), 10, 64)
-
-	dataset, _ := models.GetDatasetByID(datasetId)
-	if dataset == nil {
-		ctx.Error(http.StatusNotFound, "")
-		return
-	}
-	ctx.Data["Dataset"] = dataset
-
-	ctx.HTML(200, tplDatasetEdit)
-}
-
-func CreateDatasetPost(ctx *context.Context, form auth.CreateDatasetForm) {
-
-	dataset := &models.Dataset{}
-
-	if !titlePattern.MatchString(form.Title) {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("dataset.title_format_err")))
-		return
-	}
-	if utf8.RuneCountInString(form.Description) > 1024 {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("dataset.description_format_err")))
-		return
-	}
-
-	dataset.RepoID = ctx.Repo.Repository.ID
-	dataset.UserID = ctx.User.ID
-	dataset.Category = form.Category
-	dataset.Task = form.Task
-	dataset.Title = form.Title
-	dataset.License = form.License
-	dataset.Description = form.Description
-	dataset.DownloadTimes = 0
-	if ctx.Repo.Repository.IsPrivate {
-		dataset.Status = 0
-	} else {
-		dataset.Status = 1
-	}
-	err := models.CreateDataset(dataset)
-	if err != nil {
-		log.Error("fail to create dataset", err)
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("dataset.create_dataset_fail")))
-	} else {
-		ctx.JSON(http.StatusOK, models.BaseOKMessage)
-	}
-
-}
-
-func EditDatasetPost(ctx *context.Context, form auth.EditDatasetForm) {
-	ctx.Data["PageIsDataset"] = true
-
-	ctx.Data["Title"] = ctx.Tr("dataset.edit_dataset")
-
-	if !titlePattern.MatchString(form.Title) {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("dataset.title_format_err")))
-		return
-	}
-	if utf8.RuneCountInString(form.Description) > 1024 {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("dataset.description_format_err")))
-		return
-	}
-
-	rel, err := models.GetDatasetByID(form.ID)
-	ctx.Data["dataset"] = rel
-
-	if err != nil {
-		log.Error("failed to query dataset", err)
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("dataset.query_dataset_fail")))
-		return
-	}
-
-	rel.Title = form.Title
-	rel.Description = form.Description
-	rel.Category = form.Category
-	rel.Task = form.Task
-	rel.License = form.License
-	if err = models.UpdateDataset(models.DefaultDBContext(), rel); err != nil {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("dataset.query_dataset_fail")))
-	}
-	ctx.JSON(http.StatusOK, models.BaseOKMessage)
-}
-
-func DatasetAction(ctx *context.Context) {
-	var err error
-	datasetId, _ := strconv.ParseInt(ctx.Params(":id"), 10, 64)
-	switch ctx.Params(":action") {
-	case "star":
-		err = models.StarDataset(ctx.User.ID, datasetId, true)
-	case "unstar":
-		err = models.StarDataset(ctx.User.ID, datasetId, false)
-
-	}
-	if err != nil {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("repo.star_fail", ctx.Params(":action"))))
-	} else {
-		ctx.JSON(http.StatusOK, models.BaseOKMessage)
-	}
-
-}
-
-func CurrentRepoDataset(ctx *context.Context) {
-	page := ctx.QueryInt("page")
-	cloudbrainType := ctx.QueryInt("type")
-	keyword := strings.Trim(ctx.Query("q"), " ")
-
-	repo := ctx.Repo.Repository
-	var datasetIDs []int64
-	dataset, err := models.GetDatasetByRepo(repo)
-	if err != nil {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("GetDatasetByRepo failed", err)))
-	}
-	datasetIDs = append(datasetIDs, dataset.ID)
-	uploaderID := ctx.User.ID
-	datasets, count, err := models.Attachments(&models.AttachmentsOptions{
-		ListOptions: models.ListOptions{
-			Page:     page,
-			PageSize: setting.UI.IssuePagingNum,
-		},
-		Keyword:       keyword,
-		DatasetIDs:    datasetIDs,
-		UploaderID:    uploaderID,
-		Type:          cloudbrainType,
-		NeedIsPrivate: false,
-		NeedRepoInfo:  true,
-	})
-	if err != nil {
-		ctx.ServerError("datasets", err)
-		return
-	}
-
-	data, err := json.Marshal(datasets)
-	if err != nil {
-		log.Error("json.Marshal failed:", err.Error())
-		ctx.JSON(200, map[string]string{
-			"result_code": "-1",
-			"error_msg":   err.Error(),
-			"data":        "",
-		})
-		return
-	}
-	ctx.JSON(200, map[string]string{
-		"result_code": "0",
-		"data":        string(data),
-		"count":       strconv.FormatInt(count, 10),
-	})
-}
-
-func MyDatasets(ctx *context.Context) {
-	page := ctx.QueryInt("page")
-	cloudbrainType := ctx.QueryInt("type")
-	keyword := strings.Trim(ctx.Query("q"), " ")
-
-	uploaderID := ctx.User.ID
-	datasets, count, err := models.Attachments(&models.AttachmentsOptions{
-		ListOptions: models.ListOptions{
-			Page:     page,
-			PageSize: setting.UI.IssuePagingNum,
-		},
-		Keyword:       keyword,
-		UploaderID:    uploaderID,
-		Type:          cloudbrainType,
-		NeedIsPrivate: false,
-		NeedRepoInfo:  true,
-	})
-	if err != nil {
-		ctx.ServerError("datasets", err)
-		return
-	}
-
-	data, err := json.Marshal(datasets)
-	if err != nil {
-		log.Error("json.Marshal failed:", err.Error())
-		ctx.JSON(200, map[string]string{
-			"result_code": "-1",
-			"error_msg":   err.Error(),
-			"data":        "",
-		})
-		return
-	}
-	ctx.JSON(200, map[string]string{
-		"result_code": "0",
-		"data":        string(data),
-		"count":       strconv.FormatInt(count, 10),
-	})
-}
-
-func PublicDataset(ctx *context.Context) {
-	page := ctx.QueryInt("page")
-	cloudbrainType := ctx.QueryInt("type")
-	keyword := strings.Trim(ctx.Query("q"), " ")
-
-	datasets, count, err := models.Attachments(&models.AttachmentsOptions{
-		ListOptions: models.ListOptions{
-			Page:     page,
-			PageSize: setting.UI.IssuePagingNum,
-		},
-		Keyword:       keyword,
-		NeedIsPrivate: true,
-		IsPrivate:     false,
-		Type:          cloudbrainType,
-		NeedRepoInfo:  true,
-	})
-	if err != nil {
-		ctx.ServerError("datasets", err)
-		return
-	}
-
-	data, err := json.Marshal(datasets)
-	if err != nil {
-		log.Error("json.Marshal failed:", err.Error())
-		ctx.JSON(200, map[string]string{
-			"result_code": "-1",
-			"error_msg":   err.Error(),
-			"data":        "",
-		})
-		return
-	}
-	ctx.JSON(200, map[string]string{
-		"result_code": "0",
-		"data":        string(data),
-		"count":       strconv.FormatInt(count, 10),
-	})
-}
-
-func MyFavoriteDataset(ctx *context.Context) {
-	page := ctx.QueryInt("page")
-	cloudbrainType := ctx.QueryInt("type")
-	keyword := strings.Trim(ctx.Query("q"), " ")
-
-	var datasetIDs []int64
-
-	datasetStars, err := models.GetDatasetStarByUser(ctx.User)
-	if err != nil {
-		ctx.JSON(http.StatusOK, models.BaseErrorMessage(ctx.Tr("GetDatasetByRepo failed", err)))
-	}
-	for i, _ := range datasetStars {
-		datasetIDs = append(datasetIDs, datasetStars[i].DatasetID)
-	}
-
-	datasets, count, err := models.Attachments(&models.AttachmentsOptions{
-		ListOptions: models.ListOptions{
-			Page:     page,
-			PageSize: setting.UI.IssuePagingNum,
-		},
-		Keyword:       keyword,
-		DatasetIDs:    datasetIDs,
-		NeedIsPrivate: true,
-		IsPrivate:     false,
-		Type:          cloudbrainType,
-		NeedRepoInfo:  true,
-	})
-	if err != nil {
-		ctx.ServerError("datasets", err)
-		return
-	}
-
-	data, err := json.Marshal(datasets)
-	if err != nil {
-		log.Error("json.Marshal failed:", err.Error())
-		ctx.JSON(200, map[string]string{
-			"result_code": "-1",
-			"error_msg":   err.Error(),
-			"data":        "",
-		})
-		return
-	}
-	ctx.JSON(200, map[string]string{
-		"result_code": "0",
-		"data":        string(data),
-		"count":       strconv.FormatInt(count, 10),
-	})
-}