From 2ce05f2d6eb33f5ac4c3a27312f97b79624aa48f Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Thu, 4 Oct 2012 15:13:20 +1000 Subject: Change the behaviour of admin_url to always return a full URL --- app/helpers/link_to_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers/link_to_helper.rb') diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index c8ad7bc30..4a73b13de 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -222,7 +222,7 @@ module LinkToHelper # Admin pages def admin_url(relative_path) admin_url_prefix = Configuration::admin_base_url - admin_url_prefix = admin_general_index_path+"/" if admin_url_prefix.empty? + admin_url_prefix = admin_general_index_url + "/" if admin_url_prefix.empty? return admin_url_prefix + relative_path end -- cgit v1.2.3 From c24b2528e3393bf96e1d8ef74ea1b9022a969c13 Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Thu, 4 Oct 2012 15:26:34 +1000 Subject: Refactor for conciseness --- app/helpers/link_to_helper.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/helpers/link_to_helper.rb') diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 4a73b13de..e4e52427b 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -222,8 +222,7 @@ module LinkToHelper # Admin pages def admin_url(relative_path) admin_url_prefix = Configuration::admin_base_url - admin_url_prefix = admin_general_index_url + "/" if admin_url_prefix.empty? - return admin_url_prefix + relative_path + (admin_url_prefix.empty? ? admin_general_index_url + '/' : admin_url_prefix) + relative_path end # About page URLs -- cgit v1.2.3