- fixed simultaneously action with show and download file on doubleclick

- Changed download name for Backblaze
- Price plan can be defined in 12 digit number
This commit is contained in:
Peter Papp
2020-09-20 12:08:29 +02:00
parent 7ba2a3bec1
commit 69489c4ee2
10 changed files with 19 additions and 22 deletions
+3 -1
View File
@@ -148,7 +148,9 @@ class FileManagerFile extends Model
// Get file from external storage // Get file from external storage
if (is_storage_driver(['s3', 'spaces', 'wasabi', 'backblaze'])) { if (is_storage_driver(['s3', 'spaces', 'wasabi', 'backblaze'])) {
$file_pretty_name = is_storage_driver('backblaze') ? Str::slug(get_pretty_name($this->attributes['basename'], $this->attributes['name'], $this->attributes['mimetype'])) : get_pretty_name($this->attributes['basename'], $this->attributes['name'], $this->attributes['mimetype']); $file_pretty_name = is_storage_driver('backblaze')
? Str::snake(mb_strtolower($this->attributes['name']))
: get_pretty_name($this->attributes['basename'], $this->attributes['name'], $this->attributes['mimetype']);
$header = [ $header = [
"ResponseAcceptRanges" => "bytes", "ResponseAcceptRanges" => "bytes",
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+4 -4
View File
@@ -1,6 +1,6 @@
{ {
"/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=f6516382dbfcb5d4b6c3", "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=ae5044886b5c73e75ac4",
"/js/main.js": "/js/main.js?id=6ba46d7595be5466ade3", "/js/main.js": "/js/main.js?id=09d848fb2aa2c365bb47",
"/css/app.css": "/css/app.css?id=dbf49843b327d3936c06", "/css/app.css": "/css/app.css?id=dbf49843b327d3936c06",
"/chunks/admin.js": "/chunks/admin.js?id=5bd95ece632ca142f035", "/chunks/admin.js": "/chunks/admin.js?id=5bd95ece632ca142f035",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=b181a9ba45f475b9e004", "/chunks/admin-account.js": "/chunks/admin-account.js?id=b181a9ba45f475b9e004",
@@ -28,7 +28,7 @@
"/chunks/page-edit.js": "/chunks/page-edit.js?id=2ff6bfeb6d9c43014d69", "/chunks/page-edit.js": "/chunks/page-edit.js?id=2ff6bfeb6d9c43014d69",
"/chunks/pages.js": "/chunks/pages.js?id=49a51fc783d155aa8132", "/chunks/pages.js": "/chunks/pages.js?id=49a51fc783d155aa8132",
"/chunks/plan.js": "/chunks/plan.js?id=bbea8c9e9f807d9cedc5", "/chunks/plan.js": "/chunks/plan.js?id=bbea8c9e9f807d9cedc5",
"/chunks/plan-create.js": "/chunks/plan-create.js?id=0149731ddb88c33b066d", "/chunks/plan-create.js": "/chunks/plan-create.js?id=dc76283ccd5ec6481564",
"/chunks/plan-delete.js": "/chunks/plan-delete.js?id=e63e243dccb487fa18f5", "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=e63e243dccb487fa18f5",
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=83517dd417b8641c60c8", "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=83517dd417b8641c60c8",
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=26e1aabafdc06d069fa3", "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=26e1aabafdc06d069fa3",
@@ -48,7 +48,7 @@
"/chunks/sign-in.js": "/chunks/sign-in.js?id=0c9fe096135be58283b6", "/chunks/sign-in.js": "/chunks/sign-in.js?id=0c9fe096135be58283b6",
"/chunks/sign-up.js": "/chunks/sign-up.js?id=eaa8bc2819a9cc19dbc7", "/chunks/sign-up.js": "/chunks/sign-up.js?id=eaa8bc2819a9cc19dbc7",
"/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=cf445ba69a83dc2b3b00", "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=cf445ba69a83dc2b3b00",
"/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=d4434431a9c8fa3ffc2b", "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=3f57ef56cf8203a728f0",
"/chunks/subscription-service.js": "/chunks/subscription-service.js?id=175f558c3e09887846a5", "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=175f558c3e09887846a5",
"/chunks/trash.js": "/chunks/trash.js?id=e00ce8bde9ea638f5049", "/chunks/trash.js": "/chunks/trash.js?id=e00ce8bde9ea638f5049",
"/chunks/upgrade.js": "/chunks/upgrade.js?id=03eccfa25c668325efd0", "/chunks/upgrade.js": "/chunks/upgrade.js?id=03eccfa25c668325efd0",
@@ -198,18 +198,15 @@
goToItem() { goToItem() {
if (this.isImage || this.isVideo || this.isAudio) { if (this.isImage || this.isVideo || this.isAudio) {
events.$emit('fileFullPreview:show') events.$emit('fileFullPreview:show')
}
if (this.isFile || !this.isFolder && !this.isPdf && !this.isVideo && !this.isAudio && !this.isImage) { } else if (this.isFile || !this.isFolder && !this.isPdf && !this.isVideo && !this.isAudio && !this.isImage) {
this.$downloadFile(this.data.file_url, this.data.name + '.' + this.data.mimetype) this.$downloadFile(this.data.file_url, this.data.name + '.' + this.data.mimetype)
}
if (this.isFolder) {
} else if (this.isFolder) {
if (this.$isThisLocation('public')) { if (this.$isThisLocation('public')) {
this.$store.dispatch('browseShared', [{folder: this.data, back: false, init: false}]) this.$store.dispatch('browseShared', [{ folder: this.data, back: false, init: false }])
} else { } else {
this.$store.dispatch('getFolder', [{folder: this.data, back: false, init: false}]) this.$store.dispatch('getFolder', [{ folder: this.data, back: false, init: false }])
} }
} }
}, },
@@ -181,13 +181,11 @@ export default {
goToItem() { goToItem() {
if (this.isImage || this.isVideo || this.isAudio) { if (this.isImage || this.isVideo || this.isAudio) {
events.$emit('fileFullPreview:show') events.$emit('fileFullPreview:show')
}
if (this.isFile || !this.isFolder && !this.isPdf && !this.isVideo && !this.isAudio && !this.isImage) { } else if (this.isFile || !this.isFolder && !this.isPdf && !this.isVideo && !this.isAudio && !this.isImage) {
this.$downloadFile(this.data.file_url, this.data.name + '.' + this.data.mimetype) this.$downloadFile(this.data.file_url, this.data.name + '.' + this.data.mimetype)
}
if (this.isFolder) { } else if (this.isFolder) {
if (this.$isThisLocation('public')) { if (this.$isThisLocation('public')) {
this.$store.dispatch('browseShared', [{ folder: this.data, back: false, init: false }]) this.$store.dispatch('browseShared', [{ folder: this.data, back: false, init: false }])
} else { } else {
@@ -39,7 +39,7 @@
<div class="block-wrapper"> <div class="block-wrapper">
<label>{{ $t('admin_page_plans.form.price') }}:</label> <label>{{ $t('admin_page_plans.form.price') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Plan price" rules="required" v-slot="{ errors }"> <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Plan price" rules="required" v-slot="{ errors }">
<input v-model="plan.price" :placeholder="$t('admin_page_plans.form.price_plac')" type="number" step="0.01" min="1" max="99999" <input v-model="plan.price" :placeholder="$t('admin_page_plans.form.price_plac')" type="number" step="0.01" min="1" max="999999999999"
:class="{'is-error': errors[0]}"/> :class="{'is-error': errors[0]}"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
@@ -45,7 +45,7 @@
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Price" <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Price"
rules="required" v-slot="{ errors }"> rules="required" v-slot="{ errors }">
<input v-model="plan.attributes.price" placeholder="Type your plan price" type="number" <input v-model="plan.attributes.price" placeholder="Type your plan price" type="number"
step="0.01" min="1" max="99999" step="0.01" min="1" max="999999999999"
:class="{'is-error': errors[0]}"/> :class="{'is-error': errors[0]}"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>