github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 02:27:17 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: create upload record for exported csv files

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/validators/upload_validator.rb
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