Merge branch 'master' of github.com:internetee/registry

This commit is contained in:
Andres Keskküla 2014-10-16 12:39:27 +03:00
commit 02e313db46
41 changed files with 237 additions and 695 deletions

View file

@ -2,7 +2,7 @@ class Admin::DomainsController < AdminController
before_action :set_domain, only: [:show, :edit, :update]
def index
@q = Domain.search(params[:q])
@q = Domain.includes(:registrar, :owner_contact).search(params[:q])
@domains = @q.result.page(params[:page])
end

View file

@ -1,30 +0,0 @@
class Admin::SettingGroupsController < AdminController
before_action :set_setting_group, only: [:show, :update]
def index
@q = SettingGroup.search(params[:q])
@setting_groups = @q.result.page(params[:page])
end
def show; end
def update
if @setting_group.update(setting_group_params)
flash[:notice] = I18n.t('shared.setting_updated')
redirect_to [:admin, @setting_group]
else
flash[:alert] = I18n.t('shared.failed_to_update_setting')
render 'show'
end
end
private
def set_setting_group
@setting_group = SettingGroup.find(params[:id])
end
def setting_group_params
params.require(:setting_group).permit(settings_attributes: [:value, :id])
end
end

View file

@ -0,0 +1,48 @@
class Admin::SettingsController < AdminController
before_action :set_setting_group, only: [:show, :update]
def index
@settings = Setting.unscoped
end
def create
casted_settings.each do |k, v|
Setting[k] = v
end
flash[:notice] = I18n.t('shared.records_updated')
redirect_to [:admin, :settings]
end
def show; end
def update
if @setting_group.update(setting_group_params)
flash[:notice] = I18n.t('shared.setting_updated')
redirect_to [:admin, @setting_group]
else
flash[:alert] = I18n.t('shared.failed_to_update_setting')
render 'show'
end
end
private
def set_setting_group
@setting_group = SettingGroup.find(params[:id])
end
def setting_group_params
params.require(:setting_group).permit(settings_attributes: [:value, :id])
end
def casted_settings
settings = {}
params[:settings].each do |k, v|
settings[k] = v.to_i if Setting[k].class == Fixnum
settings[k] = v.to_f if Setting[k].class == Float
settings[k] = (v == 'true' ? true : false) if [TrueClass, FalseClass].include?(Setting[k].class)
end
settings
end
end

View file

@ -4,7 +4,7 @@ class Client::DomainsController < ClientController
before_action :verify_deletion, only: [:destroy]
def index
@q = current_registrar.domains.search(params[:q])
@q = current_registrar.domains.includes(:owner_contact).search(params[:q])
@domains = @q.result.page(params[:page])
end