zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-19 18:59:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Andres Keskküla 2014-09-25 16:45:12 +03:00
commit e7fb6208ce
12 changed files with 77 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/contacts_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::ContactsController < ApplicationController
class Admin::ContactsController < AdminController
# TODO created_by and updated_by ids
before_action :set_contact, only: [:show, :destroy, :edit, :update]

2
app/controllers/admin/domains_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::DomainsController < ApplicationController
class Admin::DomainsController < AdminController
before_action :set_domain, only: [:show, :edit, :update, :destroy]
before_action :verify_deletion, only: [:destroy]

2
app/controllers/admin/registrars_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::RegistrarsController < ApplicationController
class Admin::RegistrarsController < AdminController
def search
render json: Registrar.search_by_query(params[:q])
end

2
app/controllers/admin/setting_groups_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::SettingGroupsController < ApplicationController
class Admin::SettingGroupsController < AdminController
before_action :set_setting_group, only: [:show, :update]
def index

7
app/controllers/admin_controller.rb Normal file
View file

@ -0,0 +1,7 @@
class AdminController < ApplicationController
before_action :verify_admin
def verify_admin
redirect_to client_root_path unless current_user.try(:admin?)
end
end

3
app/controllers/client/domains_controller.rb
View file

@ -2,7 +2,8 @@ class Client::DomainsController < ClientController
include Shared::CommonDomain
def index
@q = current_user.registrar.domains.search(params[:q])
@q = Domain.search(params[:q]) if current_user.admin?
@q = current_user.registrar.domains.search(params[:q]) unless current_user.admin?
@domains = @q.result.page(params[:page])
end

4
app/controllers/sessions_controller.rb
View file

@ -1,8 +1,10 @@
class SessionsController < Devise::SessionsController
def create
if Rails.env.development?
if Rails.env.development? || Rails.env.test?
@user = User.find_by(username: 'gitlab') if params[:gitlab]
@user = User.find_by(username: 'zone') if params[:zone]
flash[:notice] = I18n.t('shared.welcome')
sign_in_and_redirect @user, :event => :authentication
return
end