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

FIX: better error handling for theme import

Browse Source
This commit is contained in:
Sam
2017-04-17 16:55:53 -04:00
parent 5e3a0846f7
commit 86904e9cd6
5 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/admin/themes_controller.rb
View File

@ -101,25 +101,32 @@ class Admin::ThemesController < Admin::AdminController
set_fields
save_remote = false
if params[:theme][:remote_check]
@theme.remote_theme.update_remote_version
@theme.remote_theme.save!
save_remote = true
end
if params[:theme][:remote_update]
@theme.remote_theme.update_from_remote
@theme.remote_theme.save!
save_remote = true
end
respond_to do |format|
if @theme.save
@theme.remote_theme.save! if save_remote
update_default_theme
log_theme_change(original_json, @theme)
format.json { render json: @theme, status: :created}
else
format.json { render json: @theme.errors, status: :unprocessable_entity }
format.json {
error = @theme.errors[:color_scheme] ? I18n.t("themes.bad_color_scheme") : I18n.t("themes.other_error")
render json: {errors: [ error ]}, status: :unprocessable_entity
}
end
end
end