From 402b0e9c24fc613f642d086f08f7f4ff4149fe7b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 14 Mar 2016 23:15:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E9=83=BD=E4=BD=BF=E7=94=A8Se?= =?UTF-8?q?tting.host=5Fname=E8=8E=B7=E5=8F=96=E4=B8=BB=E6=9C=BA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 31decde59..1aca4fb0b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2943,21 +2943,9 @@ int main(int argc, char** argv){ end def user_url_in_org(user_id) - if Rails.env.development? - return "http://localhost:3000/users/" + user_id.to_s - elsif Rails.env.test? - return "https://www.test.forge.trustie.net/users/" + user_id.to_s - else - return "https://www.trustie.net/users/" + user_id.to_s - end + return Setting.host_name + "/users/" + user_id.to_s end def logout_url_without_domain - if Rails.env.development? - return "http://localhost:3000/logout" - elsif Rails.env.test? - return "https://test.forge.trustie.net/logout" - else - return "https://www.trustie.net/logout" - end + return Setting.host_name + "/logout" end