mirror of
https://github.com/discourse/discourse.git
synced 2025-06-07 11:54:44 +08:00
DEV: Promote uppy backup uploader to primary uploader (#15363)
This commit removes the enable_experimental_backup_uploader site setting and the flags in backups-index.hbs to make the uppy backup uploader the main one from now on. A follow-up commit will delete the old backup uploader code and also remove resumable.js from the project.
This commit is contained in:
@ -1,22 +1,8 @@
|
|||||||
<div class="backup-options">
|
<div class="backup-options">
|
||||||
{{#if localBackupStorage}}
|
{{#if localBackupStorage}}
|
||||||
{{#if siteSettings.enable_experimental_backup_uploader}}
|
|
||||||
{{uppy-backup-uploader done=(route-action "uploadSuccess") localBackupStorage=localBackupStorage}}
|
{{uppy-backup-uploader done=(route-action "uploadSuccess") localBackupStorage=localBackupStorage}}
|
||||||
{{else}}
|
{{else}}
|
||||||
{{resumable-upload
|
|
||||||
target="/admin/backups/upload"
|
|
||||||
success=(route-action "uploadSuccess")
|
|
||||||
error=(route-action "uploadError")
|
|
||||||
uploadText=uploadLabel
|
|
||||||
title="admin.backups.upload.title"
|
|
||||||
class="btn-default"}}
|
|
||||||
{{/if}}
|
|
||||||
{{else}}
|
|
||||||
{{#if siteSettings.enable_experimental_backup_uploader}}
|
|
||||||
{{uppy-backup-uploader done=(route-action "remoteUploadSuccess")}}
|
{{uppy-backup-uploader done=(route-action "remoteUploadSuccess")}}
|
||||||
{{else}}
|
|
||||||
{{backup-uploader done=(route-action "remoteUploadSuccess")}}
|
|
||||||
{{/if}}
|
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{#if site.isReadOnly}}
|
{{#if site.isReadOnly}}
|
||||||
|
@ -273,10 +273,6 @@ basic:
|
|||||||
client: true
|
client: true
|
||||||
default: false
|
default: false
|
||||||
hidden: true
|
hidden: true
|
||||||
enable_experimental_backup_uploader:
|
|
||||||
client: true
|
|
||||||
default: false
|
|
||||||
hidden: true
|
|
||||||
enable_direct_s3_uploads:
|
enable_direct_s3_uploads:
|
||||||
client: true
|
client: true
|
||||||
default: false
|
default: false
|
||||||
|
@ -0,0 +1,14 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class RemoveExperimentalBackupUploaderSetting < ActiveRecord::Migration[6.1]
|
||||||
|
def up
|
||||||
|
execute <<~SQL
|
||||||
|
DELETE FROM site_settings
|
||||||
|
WHERE name = 'enable_experimental_backup_uploader'
|
||||||
|
SQL
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
raise ActiveRecord::IrreversibleMigration
|
||||||
|
end
|
||||||
|
end
|
Reference in New Issue
Block a user