Use the new Ruby 1.9 hash syntax
This commit is contained in:
parent
6912cd607e
commit
72a431a5e4
@ -1,7 +1,7 @@
|
||||
module RedmineLandingPage
|
||||
module Hooks
|
||||
class ViewMyAccountHook < Redmine::Hook::ViewListener
|
||||
render_on(:view_my_account, :partial => 'my/landing_page', :layout => false)
|
||||
render_on(:view_my_account, partial: 'my/landing_page', layout: false)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1,7 +1,7 @@
|
||||
module RedmineLandingPage
|
||||
module Hooks
|
||||
class ViewProjectsFormHook < Redmine::Hook::ViewListener
|
||||
render_on(:view_projects_form, :partial => 'projects/landing_page', :layout => false)
|
||||
render_on(:view_projects_form, partial: 'projects/landing_page', layout: false)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1,7 +1,7 @@
|
||||
module RedmineLandingPage
|
||||
module Hooks
|
||||
class ViewUsersFormHook < Redmine::Hook::ViewListener
|
||||
render_on(:view_users_form, :partial => 'users/landing_page', :layout => false)
|
||||
render_on(:view_users_form, partial: 'users/landing_page', layout: false)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -9,7 +9,7 @@ module RedmineLandingPage
|
||||
|
||||
def show
|
||||
if @project.landing_page && !@project.landing_page.empty?
|
||||
redirect_to @project.landing_page, :status => 302
|
||||
redirect_to @project.landing_page, status: 302
|
||||
else
|
||||
show_without_landing_page
|
||||
end
|
||||
|
@ -11,7 +11,7 @@ module RedmineLandingPage
|
||||
if User.current.logged? &&
|
||||
User.current.landing_page &&
|
||||
!User.current.landing_page.empty?
|
||||
redirect_to User.current.landing_page, :status => 302
|
||||
redirect_to User.current.landing_page, status: 302
|
||||
else
|
||||
index_without_landing_page
|
||||
end
|
||||
|
@ -9,16 +9,16 @@ class ProjectsControllerTest < ActionController::TestCase
|
||||
end
|
||||
|
||||
def test_no_redirect_to_landing_page
|
||||
@project = Project.generate!(:identifier => 'demo')
|
||||
get :show, :id => @project.identifier
|
||||
@project = Project.generate!(identifier: 'demo')
|
||||
get :show, id: @project.identifier
|
||||
assert_response :success
|
||||
assert_template 'show'
|
||||
end
|
||||
|
||||
def test_redirect_to_landing_page
|
||||
@project = Project.generate!(:identifier => 'demo',
|
||||
:landing_page => "http://#{@request.host}/projects/demo/news")
|
||||
get :show, :id => @project.identifier
|
||||
@project = Project.generate!(identifier: 'demo',
|
||||
landing_page: "http://#{@request.host}/projects/demo/news")
|
||||
get :show, id: @project.identifier
|
||||
assert_redirected_to "http://#{@request.host}/projects/#{@project.identifier}/news"
|
||||
end
|
||||
end
|
||||
|
@ -15,7 +15,7 @@ class WelcomeControllerTest < ActionController::TestCase
|
||||
end
|
||||
|
||||
def test_redirect_to_landing_page
|
||||
@user = User.generate!(:landing_page => "http://#{@request.host}/projects")
|
||||
@user = User.generate!(landing_page: "http://#{@request.host}/projects")
|
||||
@request.session[:user_id] = @user.id
|
||||
get :index
|
||||
assert_redirected_to "http://#{@request.host}/projects"
|
||||
|
Loading…
x
Reference in New Issue
Block a user