FIX: create upload record for exported csv files

This commit is contained in:
Arpit Jalan
2018-04-19 17:00:31 +05:30
parent 58a53017c9
commit 91bf10bd12
13 changed files with 99 additions and 87 deletions

View File

@@ -20,6 +20,7 @@ class UploadCreator
# - for_theme (boolean)
# - for_private_message (boolean)
# - pasted (boolean)
# - for_export (boolean)
def initialize(file, filename, opts = {})
@file = file
@filename = filename || ''
@@ -84,6 +85,7 @@ class UploadCreator
@upload.for_private_message = true if @opts[:for_private_message]
@upload.for_group_message = true if @opts[:for_group_message]
@upload.for_theme = true if @opts[:for_theme]
@upload.for_export = true if @opts[:for_export]
return @upload unless @upload.save

View File

@@ -63,7 +63,13 @@ class Validators::UploadValidator < ActiveModel::Validator
end
def authorized_extensions(upload)
extensions = upload.for_theme ? SiteSetting.theme_authorized_extensions : SiteSetting.authorized_extensions
extensions = if upload.for_theme
SiteSetting.theme_authorized_extensions
elsif upload.for_export
SiteSetting.export_authorized_extensions
else
SiteSetting.authorized_extensions
end
extensions_to_set(extensions)
end
@@ -79,7 +85,13 @@ class Validators::UploadValidator < ActiveModel::Validator
if upload.user&.staff?
return true if SiteSetting.authorized_extensions_for_staff.include?("*")
end
extensions = upload.for_theme ? SiteSetting.theme_authorized_extensions : SiteSetting.authorized_extensions
extensions = if upload.for_theme
SiteSetting.theme_authorized_extensions
elsif upload.for_export
SiteSetting.export_authorized_extensions
else
SiteSetting.authorized_extensions
end
extensions.include?("*")
end