Merge branch '107192666-ds-key-data-dnssec' into staging

This commit is contained in:
Matt Farnsworth 2015-11-20 17:05:52 +02:00
commit 30d1c406a2
7 changed files with 168 additions and 117 deletions

View file

@ -7,12 +7,18 @@ class Admin::SettingsController < AdminController
end
def create
casted_settings.each do |k, v|
Setting[k] = v
end
@errors = Setting.params_errors(casted_settings)
if @errors.empty?
casted_settings.each do |k, v|
Setting[k] = v
end
flash[:notice] = I18n.t('records_updated')
redirect_to [:admin, :settings]
flash[:notice] = I18n.t('records_updated')
redirect_to [:admin, :settings]
else
flash[:alert] = @errors.values.uniq.join(", ")
render "admin/settings/index"
end
end
def show; end