Fixed registrar module helper

This commit is contained in:
Priit Tark 2015-04-13 11:23:56 +03:00
parent 9bb20365c9
commit 8df6b3bdd1
4 changed files with 19 additions and 17 deletions

View file

@ -2,8 +2,8 @@ class Registrar::PollsController < Registrar::DeppController # EPP controller
before_action :init_epp_xml
def show
authorize! :view, :registrar_dashboard
@data = depp_current_user.request(@ex.poll)
authorize! :view, :registrar_dashboard
@data = depp_current_user.request(@ex.poll)
end
def destroy

View file

@ -1,5 +1,9 @@
class Registrar::SessionsController < ::SessionsController
layout 'registrar/application'
helper_method :depp_controller?
def depp_controller?
false
end
def create
@user = ApiUser.first if params[:user1]

View file

@ -1,15 +1,13 @@
module Registrar
module ApplicationHelper
def env_style
return '' if unstable_env.nil?
"background-image: url(#{image_path("registrar/bg-#{unstable_env}.png")});"
end
module Registrar::ApplicationHelper
def env_style
return '' if unstable_env.nil?
"background-image: url(#{image_path("registrar/bg-#{unstable_env}.png")});"
end
def pagination_details
params[:page] ||= 1
limit = ENV['depp_records_on_page'] || 20
offset = ((params[:page].to_i - 1) * limit.to_i)
[limit, offset]
end
def pagination_details
params[:page] ||= 1
limit = ENV['depp_records_on_page'] || 20
offset = ((params[:page].to_i - 1) * limit.to_i)
[limit, offset]
end
end

View file

@ -6,17 +6,17 @@ feature 'Root', type: :feature do
Fabricate(:api_user)
end
fit 'should redirect to registrar login page' do
it 'should redirect to registrar login page' do
visit '/registrar/login'
current_path.should == '/registrar/login'
end
fit 'should redirect to registrar login page' do
it 'should redirect to registrar login page' do
visit '/registrar'
current_path.should == '/registrar/login'
end
fit 'should redirect to registrar login page' do
it 'should redirect to registrar login page' do
visit '/registrar/'
current_path.should == '/registrar/login'
end