mirror of
https://github.com/discourse/discourse.git
synced 2025-06-05 14:07:30 +08:00
FIX: remote theme record not saved when checking for updates (#8054)
This commit is contained in:
@ -186,22 +186,16 @@ class Admin::ThemesController < Admin::AdminController
|
||||
update_translations
|
||||
handle_switch
|
||||
|
||||
save_remote = false
|
||||
if params[:theme][:remote_check]
|
||||
@theme.remote_theme.update_remote_version
|
||||
save_remote = true
|
||||
end
|
||||
|
||||
if params[:theme][:remote_update]
|
||||
@theme.remote_theme.update_from_remote
|
||||
save_remote = true
|
||||
end
|
||||
|
||||
respond_to do |format|
|
||||
if @theme.save
|
||||
|
||||
@theme.remote_theme.save! if save_remote
|
||||
|
||||
update_default_theme
|
||||
|
||||
@theme.reload
|
||||
|
@ -106,6 +106,8 @@ class RemoteTheme < ActiveRecord::Base
|
||||
self.updated_at = Time.zone.now
|
||||
self.remote_version, self.commits_behind = importer.commits_since(local_version)
|
||||
self.last_error_text = nil
|
||||
ensure
|
||||
self.save!
|
||||
end
|
||||
end
|
||||
|
||||
@ -119,6 +121,7 @@ class RemoteTheme < ActiveRecord::Base
|
||||
importer.import!
|
||||
rescue RemoteTheme::ImportError => err
|
||||
self.last_error_text = err.message
|
||||
self.save!
|
||||
return self
|
||||
else
|
||||
self.last_error_text = nil
|
||||
@ -163,6 +166,7 @@ class RemoteTheme < ActiveRecord::Base
|
||||
|
||||
update_theme_color_schemes(theme, theme_info["color_schemes"]) unless theme.component
|
||||
|
||||
self.save!
|
||||
self
|
||||
ensure
|
||||
begin
|
||||
|
Reference in New Issue
Block a user