jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang

This commit is contained in:
ouyangxuhua 2016-03-16 10:01:42 +08:00
parent 9bac560906 402b0e9c24
commit da1b27cd38
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/helpers/application_helper.rb
View File

@ -2943,23 +2943,11 @@ int main(int argc, char** argv){
end end
def user_url_in_org(user_id) def user_url_in_org(user_id)
if Rails.env.development? return Setting.host_name + "/users/" + user_id.to_s
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
end end
def logout_url_without_domain def logout_url_without_domain
if Rails.env.development? return Setting.host_name + "/logout"
return "http://localhost:3000/logout"
elsif Rails.env.test?
return "https://test.forge.trustie.net/logout"
else
return "https://www.trustie.net/logout"
end
end end
def signin_url_without_domain def signin_url_without_domain