Merge branch 'develop' of git.pcl.ac.cn:yoyoyard/opendata into develop

download: change content to url

models/attachment.go

@@ -24,6 +24,7 @@ type Attachment struct {
 	ID            int64  `xorm:"pk autoincr"`
 	UUID          string `xorm:"uuid UNIQUE"`
 	IssueID       int64  `xorm:"INDEX"`
+	DatasetID     int64  `xorm:"INDEX DEFAULT 0"`
 	ReleaseID     int64  `xorm:"INDEX"`
 	UploaderID    int64  `xorm:"INDEX DEFAULT 0"` // Notice: will be zero before this column added
 	CommentID     int64

models/dataset.go

@@ -1,6 +1,8 @@
 package models
 
 import (
+	"fmt"
+
 	"code.gitea.io/gitea/modules/timeutil"
 )
 
@@ -29,3 +31,22 @@ func CreateDataset(dataset *Dataset) (err error) {
 
 	return nil
 }
+
+// AddReleaseAttachments adds a release attachments
+func AddDatasetAttachments(DatasetID int64, attachmentUUIDs []string) (err error) {
+	// Check attachments
+	attachments, err := GetAttachmentsByUUIDs(attachmentUUIDs)
+	if err != nil {
+		return fmt.Errorf("GetAttachmentsByUUIDs [uuids: %v]: %v", attachmentUUIDs, err)
+	}
+
+	for i := range attachments {
+		attachments[i].DatasetID = DatasetID
+		// No assign value could be 0, so ignore AllCols().
+		if _, err = x.ID(attachments[i].ID).Update(attachments[i]); err != nil {
+			return fmt.Errorf("update attachment [%d]: %v", attachments[i].ID, err)
+		}
+	}
+
+	return
+}

modules/auth/dataset.go

@@ -13,6 +13,7 @@ type CreateDatasetForm struct {
 	License     string `binding:"Required;MaxSize(64)"`
 	Task        string `binding:"Required;MaxSize(64)"`
 	ReleaseID   int64  `xorm:"INDEX"`
+	Files       []string
 }
 
 // Validate validates the fields

options/locale/locale_en-US.ini

@@ -621,7 +621,7 @@ email_notifications.disable = Disable Email Notifications
 email_notifications.submit = Set Email Preference
 
 [dataset]
-title = Title
+title = Name
 description = Description
 create_dataset = Create Dataset
 category = Category

options/locale/locale_zh-CN.ini

@@ -620,7 +620,7 @@ email_notifications.disable=停用邮件通知
 email_notifications.submit=邮件通知设置
 
 [dataset]
-title = 主题
+title = 名称
 description = 描述
 create_dataset = 创建数据集
 category = 分类

routers/dataset/dataset.go

@@ -72,6 +72,17 @@ func CreatePost(ctx *context.Context, form auth.CreateDatasetForm) {
 		log.Error("%v", err)
 	}
 
+	var attachmentUUIDs []string
+	if setting.Attachment.Enabled {
+		attachmentUUIDs = form.Files
+	}
+
+	log.Error("%v", attachmentUUIDs)
+
+	if err = models.AddDatasetAttachments(opts.ID, attachmentUUIDs); err != nil {
+		log.Error("%v", err)
+	}
+
 	if err == nil {
 		log.Trace("Dataset created [%d]: %s/%s", opts.ID, ctxUser.Name, opts.Title)
 		ctx.Redirect(setting.AppSubURL + "/datasets")

web_src/js/index.js

@@ -2313,10 +2313,9 @@ $(document).ready(async () => {
     previewTemplate += '<div class="dz-preview dz-file-preview">\n ';
     previewTemplate += '    <div class="dz-details">\n ';
     previewTemplate += '        <div class="dz-filename">';
-    previewTemplate += '            <span data-dz-name></span>';
+    previewTemplate += '            <span data-dz-name data-dz-thumbnail></span>';
     previewTemplate += '        </div>\n    ';
     previewTemplate += '        <div class="dz-size" data-dz-size></div>\n  ';
-    previewTemplate += '        <img data-dz-thumbnail />\n  ';
     previewTemplate += '    </div>\n  ';
     previewTemplate += '    <div class="dz-progress ui active progress">';
     previewTemplate += '        <div class="dz-upload bar" data-dz-uploadprogress><div class="progress"></div></div>\n  ';
@@ -2343,6 +2342,7 @@ $(document).ready(async () => {
       dictInvalidFileType: $dataset.data('invalid-input-type'),
       dictFileTooBig: $dataset.data('file-too-big'),
       dictRemoveFile: $dataset.data('remove-file'),
+      timeout: 3600000,
       previewTemplate,
       init() {
         this.on('success', (file, data) => {

web_src/less/_dataset.less

@@ -7,10 +7,11 @@
         border-bottom: 1px solid rgb(218, 220, 224);
         min-height: 0;
       }
-      .dz-preview.dz-file-preview.dz-processing {
+      .dz-preview.dz-processing {
         display: flex;
         align-items: center;
         .dz-details {
+          opacity: 1 !important;
           display: flex;
           padding: 0 0 10px 0;
           min-width: 60%;