diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8c5d4acea..e35d0cebe 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2897,183 +2897,75 @@ 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 + Setting.host_name + "/users/" + user_id.to_s end def project_issues_url_in_org(project_id) - if Rails.env.development? - return "http://localhost:3000/projects/" + project_id.to_s + "/issues" - elsif Rails.env.test? - return "https://www.test.forge.trustie.net/projects/" + project_id.to_s + "/issues" - else - return "https://www.trustie.net/projects/" + project_id.to_s + "/issues" - end + Setting.host_name + "/projects/" + project_id.to_s + "/issues" end def issue_url_in_org(id) - if Rails.env.development? - return "http://localhost:3000/issues/" + id.to_s - elsif Rails.env.test? - return "https://www.test.forge.trustie.net/issues/" + id.to_s - else - return "https://www.trustie.net/issues/" + id.to_s - end + Setting.host_name + "/issues/" + id.to_s end def project_boards_url_in_org(id) - if Rails.env.development? - return "http://localhost:3000/projects/" + id.to_s + "/boards" - elsif Rails.env.test? - return "https://www.test.forge.trustie.net/projects/" + id.to_s + "/boards" - else - return "https://www.trustie.net/projects/" + id.to_s + "/boards" - end + Setting.host_name + "/projects/" + id.to_s + "/boards" end def board_message_url_in_org(board_id, message_id) - if Rails.env.development? - return "http://localhost:3000/boards/" + board_id.to_s + "/topics/" + message_id.to_s - elsif Rails.env.test? - return "https://www.test.forge.trustie.net/boards/" + board_id.to_s + "/topics/" + message_id.to_s - else - return "https://www.trustie.net/boards/" + board_id.to_s + "/topics/" + message_id.to_s - end + Setting.host_name + "/boards/" + board_id.to_s + "/topics/" + message_id.to_s end def project_url_in_org(id) - if Rails.env.development? - return "http://localhost:3000/projects/" + id.to_s - elsif Rails.env.test? - return "https://test.forge.trustie.net/projects/" + id.to_s - else - return "https://www.trustie.net/projects/" + id.to_s - end + Setting.host_name + "/projects/" + id.to_s end def homework_common_index_url_in_org(course_id) - if Rails.env.development? - return "http://localhost:3000/homework_common?course=" + course_id.to_s - elsif Rails.env.test? - return "https://test.forge.trustie.net/homework_common?course=" + course_id.to_s - else - return "https://www.trustie.net/homework_common?course=" + course_id.to_s - end + Setting.host_name + "/homework_common?course=" + course_id.to_s end def student_work_index_url_in_org(homework_id) - if Rails.env.development? - return "http://localhost:3000/student_work?homework=" + homework_id.to_s - elsif Rails.env.test? - return "https://test.forge.trustie.net/student_work?homework=" + course_id.to_s - else - return "https://www.trustie.net/student_work?homework=" + course_id.to_s - end + Setting.host_name + "/student_work?homework=" + homework_id.to_s end def course_url_in_org(course_id) - if Rails.env.development? - return "http://localhost:3000/courses/" + course_id.to_s - elsif Rails.env.test? - return "https://test.forge.trustie.net/courses/" + course_id.to_s - else - return "https://www.trustie.net/courses/" + course_id.to_s - end + Setting.host_name + "/courses/" + course_id.to_s end def user_watchlist_url_in_org(id) - if Rails.env.development? - return "http://localhost:3000/users/" + id.to_s + "/user_watchlist" - elsif Rails.env.test? - return "https://test.forge.trustie.net/users/" + id.to_s + "/user_watchlist" - else - return "https://www.trustie.net/users/" + id.to_s + "/user_watchlist" - end + Setting.host_name + "/users/" + id.to_s + "/user_watchlist" end def user_fanslist_url_in_org(id) - if Rails.env.development? - return "http://localhost:3000/users/" + id.to_s + "/user_fanslist" - elsif Rails.env.test? - return "https://test.forge.trustie.net/users/" + id.to_s + "/user_fanslist" - else - return "https://www.trustie.net/users/" + id.to_s + "/user_fanslist" - end + Setting.host_name + "/users/" + id.to_s + "/user_fanslist" end def user_blogs_url_in_org(user_id) - if Rails.env.development? - return "http://localhost:3000/users/" + user_id.to_s + "/blogs" - elsif Rails.env.test? - return "https://test.forge.trustie.net/users/" + user_id.to_s + "/blogs" - else - return "https://www.trustie.net/users/" + user_id.to_s + "/blogs" - end + Setting.host_name + "/users/" + user_id.to_s + "/blogs" end def feedback_url_in_org(user_id) - if Rails.env.development? - return "http://localhost:3000/users/" + user_id.to_s + "/user_newfeedback" - elsif Rails.env.test? - return "https://test.forge.trustie.net/users/" + user_id.to_s + "/user_newfeedback" - else - return "https://www.trustie.net/users/" + user_id.to_s + "/user_newfeedback" - end + Setting.host_name + "/users/" + user_id.to_s + "/user_newfeedback" end def user_activities_url_in_org(user_id) - if Rails.env.development? - return "http://localhost:3000/users/" + user_id.to_s + "/user_activities" - elsif Rails.env.test? - return "http://test.forge.trustie.net/users/" + user_id.to_s + "/user_activities" - else - return "http://www.trustie.net/users/" + user_id.to_s + "/user_activities" - end + Setting.host_name + "/users/" + user_id.to_s + "/user_activities" end def course_news_index_url_in_org(course_id) - if Rails.env.development? - return "http://localhost:3000/courses/" + course_id.to_s + "/news" - elsif Rails.env.test? - return "https://test.forge.trustie.net/courses/" + course_id.to_s + "/news" - else - return "https://www.trustie.net/courses/" + course_id.to_s + "/news" - end + Setting.host_name + "/courses/" + course_id.to_s + "/news" end def news_url_in_org(news_id) - if Rails.env.development? - return "http://localhost:3000/news/" + news_id.to_s - elsif Rails.env.test? - return "https://test.forge.trustie.net/news/" + news_id.to_s - else - return "https://www.trustie.net/news/" + news_id.to_s - end + Setting.host_name + "/news/" + news_id.to_s end def course_boards_url_in_org(course_id) - if Rails.env.development? - return "http://localhost:3000/courses/" + course_id.to_s + "/boards" - elsif Rails.env.test? - return "https://test.forge.trustie.net/courses/" + course_id.to_s + "/boards" - else - return "https://www.trustie.net/courses/" + course_id.to_s + "/boards" - end + Setting.host_name + "/courses/" + course_id.to_s + "/boards" 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 + Setting.host_name + "/logout" end #判断是否为默认的组织栏目 diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 6900cbd34..2bc00d6b1 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -194,7 +194,7 @@