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

app/assets/stylesheets/login.css.scss

@@ -1,7 +1,6 @@
 body {
   padding-top: 40px;
   padding-bottom: 40px;
-  background-color: #eee;
 }
 
 .form-signin {

app/controllers/admin/contacts_controller.rb

@@ -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]
 

app/controllers/admin/domains_controller.rb

@@ -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]
 

app/controllers/admin/registrars_controller.rb

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

app/controllers/admin/setting_groups_controller.rb

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

app/controllers/admin_controller.rb

@@ -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

app/controllers/client/domains_controller.rb

@@ -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
 

app/controllers/sessions_controller.rb

@@ -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

app/views/layouts/login.haml

@@ -14,9 +14,13 @@
   %body
     .container
       .form-signin
+        - display = (flash.empty?) ? 'none' : 'block'
+        #flash{style: "display: #{display};"}
+          - type = (flash[:notice]) ? 'bg-success' : 'bg-danger'
+          .alert{class: type}= flash[:notice] || flash[:alert]
         %h2.form-signin-heading.text-center Eesti Interneti SA
         %hr
-        - if Rails.env.development?
+        - if Rails.env.development? || Rails.env.test?
           = button_to 'ID card (gitlab)', 'sessions', class: 'btn btn-lg btn-primary btn-block', name: 'gitlab'
           = button_to 'ID card (zone)', 'sessions', class: 'btn btn-lg btn-primary btn-block', name: 'zone'
         -else