| @@ -6,8 +6,9 @@ | |||||
| package models | package models | ||||
| import ( | import ( | ||||
| "code.gitea.io/gitea/modules/git" | |||||
| "fmt" | "fmt" | ||||
| "code.gitea.io/gitea/modules/git" | |||||
| ) | ) | ||||
| // ErrNotExist represents a non-exist error. | // ErrNotExist represents a non-exist error. | ||||
| @@ -1973,8 +1974,8 @@ func (err ErrOAuthApplicationNotFound) Error() string { | |||||
| // ErrFileChunkNotExist represents a "FileChunkNotExist" kind of error. | // ErrFileChunkNotExist represents a "FileChunkNotExist" kind of error. | ||||
| type ErrFileChunkNotExist struct { | type ErrFileChunkNotExist struct { | ||||
| Md5 string | |||||
| Uuid string | |||||
| Md5 string | |||||
| Uuid string | |||||
| } | } | ||||
| func (err ErrFileChunkNotExist) Error() string { | func (err ErrFileChunkNotExist) Error() string { | ||||
| @@ -12027,11 +12027,6 @@ | |||||
| } | } | ||||
| } | } | ||||
| }, | }, | ||||
| "simple-uploader.js": { | |||||
| "version": "0.5.4", | |||||
| "resolved": "https://registry.npmjs.org/simple-uploader.js/-/simple-uploader.js-0.5.4.tgz", | |||||
| "integrity": "sha512-Dmysgp0wyKqGdnZ9qnxS7QTg/Hfr25GxKM2XlrEnmzSPFmKroFqzW4Qaq/AbJDBvXv4YPGqS3S5YfVI3UxAU0A==" | |||||
| }, | |||||
| "slash": { | "slash": { | ||||
| "version": "3.0.0", | "version": "3.0.0", | ||||
| "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", | "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", | ||||
| @@ -14341,14 +14336,6 @@ | |||||
| "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz", | "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz", | ||||
| "integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg==" | "integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg==" | ||||
| }, | }, | ||||
| "vue-simple-uploader": { | |||||
| "version": "0.7.4", | |||||
| "resolved": "https://registry.npmjs.org/vue-simple-uploader/-/vue-simple-uploader-0.7.4.tgz", | |||||
| "integrity": "sha512-33uv07lkVj7m9gI7IIrQHAUcZkvl70g55lxnfnO/MZ8icwqiemW9Ah4ZexGWNrEfL1p6fV54PlOGICU17aBPFQ==", | |||||
| "requires": { | |||||
| "simple-uploader.js": "^0.5.4" | |||||
| } | |||||
| }, | |||||
| "vue-style-loader": { | "vue-style-loader": { | ||||
| "version": "4.1.2", | "version": "4.1.2", | ||||
| "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", | "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", | ||||
| @@ -46,7 +46,6 @@ | |||||
| "vue-calendar-heatmap": "0.8.4", | "vue-calendar-heatmap": "0.8.4", | ||||
| "vue-loader": "15.9.2", | "vue-loader": "15.9.2", | ||||
| "vue-router": "3.3.4", | "vue-router": "3.3.4", | ||||
| "vue-simple-uploader": "0.7.4", | |||||
| "vue-template-compiler": "2.6.11", | "vue-template-compiler": "2.6.11", | ||||
| "webpack": "4.43.0", | "webpack": "4.43.0", | ||||
| "webpack-cli": "3.3.11", | "webpack-cli": "3.3.11", | ||||
| @@ -3,5 +3,6 @@ | |||||
| <label>{{.i18n.Tr "dataset.file"}}</label> | <label>{{.i18n.Tr "dataset.file"}}</label> | ||||
| <div class="files"></div> | <div class="files"></div> | ||||
| <div class="ui dropzone" id="dataset" data-upload-url="{{.url}}" data-uuid="{{.uuid}}" data-add-url="{{AppSubUrl}}/attachments/add" data-accepts="{{.AttachmentAllowedTypes}}" data-remove-url="{{AppSubUrl}}/attachments/delete" data-csrf="{{.CsrfToken}}" dataset-id={{.dataset.ID}} data-max-file="100" data-dataset-id="{{.dataset.ID}}" data-max-size="{{.AttachmentMaxSize}}" data-default-message="{{.i18n.Tr "dropzone.default_message"}}" data-invalid-input-type="{{.i18n.Tr "dropzone.invalid_input_type"}}" data-file-too-big="{{.i18n.Tr "dropzone.file_too_big"}}" data-remove-file="{{.i18n.Tr "dropzone.remove_file"}}"> | <div class="ui dropzone" id="dataset" data-upload-url="{{.url}}" data-uuid="{{.uuid}}" data-add-url="{{AppSubUrl}}/attachments/add" data-accepts="{{.AttachmentAllowedTypes}}" data-remove-url="{{AppSubUrl}}/attachments/delete" data-csrf="{{.CsrfToken}}" dataset-id={{.dataset.ID}} data-max-file="100" data-dataset-id="{{.dataset.ID}}" data-max-size="{{.AttachmentMaxSize}}" data-default-message="{{.i18n.Tr "dropzone.default_message"}}" data-invalid-input-type="{{.i18n.Tr "dropzone.invalid_input_type"}}" data-file-too-big="{{.i18n.Tr "dropzone.file_too_big"}}" data-remove-file="{{.i18n.Tr "dropzone.remove_file"}}"> | ||||
| </div> | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| @@ -8,7 +8,6 @@ import './polyfills.js'; | |||||
| import Vue from 'vue'; | import Vue from 'vue'; | ||||
| import 'jquery.are-you-sure'; | import 'jquery.are-you-sure'; | ||||
| import './vendor/semanticdropdown.js'; | import './vendor/semanticdropdown.js'; | ||||
| import VueSimpleUploader from 'vue-simple-uploader'; | |||||
| import {svg} from './utils.js'; | import {svg} from './utils.js'; | ||||
| import initContextPopups from './features/contextpopup.js'; | import initContextPopups from './features/contextpopup.js'; | ||||
| @@ -24,8 +23,6 @@ import {initNotificationsTable, initNotificationCount} from './features/notifica | |||||
| import {createCodeEditor} from './features/codeeditor.js'; | import {createCodeEditor} from './features/codeeditor.js'; | ||||
| import MinioUploader from './components/MinioUploader.vue'; | import MinioUploader from './components/MinioUploader.vue'; | ||||
| Vue.use(VueSimpleUploader); | |||||
| const {AppSubUrl, StaticUrlPrefix, csrf} = window.config; | const {AppSubUrl, StaticUrlPrefix, csrf} = window.config; | ||||
| function htmlEncode(text) { | function htmlEncode(text) { | ||||