From 2a46d60433d5b180af5c94c428368ab0a7c34a2e Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 15 Mar 2016 11:19:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E7=9A=84=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E7=9A=84host=5Fname=E5=9D=87=E4=BD=BF=E7=94=A8Setting?= =?UTF-8?q?.host=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 144 +++--------------- .../_org_course_homework.html.erb | 16 +- .../organizations/_org_course_poll.html.erb | 2 +- .../users/_watch_btn_for_picture.html.erb | 4 +- 4 files changed, 29 insertions(+), 137 deletions(-) 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 @@
<% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_url_in_org(project.id),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> <% else %> <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %> <% end %> @@ -227,17 +227,17 @@
    • - <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity), :class => "postOptionLink"%> + <%= link_to l(:button_edit),Setting.host_name + "/homework_common/" + activity.id.to_s + "/edit?", :class => "postOptionLink"%>
    • - <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink") %> + <%= link_to(l(:label_bid_respond_delete), Setting.host_name + "/homework_common/" + activity.id.to_s + "?is_in_course=-1&course_activity=" + course_activity.to_s,:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink") %>
    • - <%= link_to("评分设置", score_rule_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => 0),:class => "postOptionLink", :remote => true) %> + <%= link_to("评分设置", Setting.host_name + "/homework_common/" + activity.id.to_s + "/score_rule_set?is_in_course=0&user_activity_id=" + user_activity_id.to_s,:class => "postOptionLink", :remote => true) %>
      • <% if activity.anonymous_comment == 0 %>
    • - <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%> + <%= link_to("匿评设置", Setting.host_name + "/homework_common/" + activity.id.to_s + "/start_evaluation_set",:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
    • <%= homework_anonymous_comment activity,-1,user_activity_id,course_activity %> @@ -245,17 +245,17 @@ <% end %> <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
    • - <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink", + <%= link_to("禁用匿评", Setting.host_name + "/homework_common/" + activity.id.to_s + "/alert_forbidden_anonymous_comment?user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s,:class => "postOptionLink", :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品",:remote => true)%>
      • <% end %> <% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %>
    • - <%= link_to("公开作品", alert_open_student_works_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%> + <%= link_to("公开作品", Setting.host_name + "/homework_common/" + activity.id.to_s + "/alert_open_student_works?is_in_course=-1&user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s,:class => "postOptionLink", :remote => true)%>
      • <% elsif activity.is_open == 1 %>
    • - <%= link_to("取消公开", alert_open_student_works_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%> + <%= link_to("取消公开", Setting.host_name + "/homework_common/" + activity.id.to_s + "/alert_open_student_works?is_in_course=-1&user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s,:class => "postOptionLink", :remote => true)%>
      • <% end %>
    diff --git a/app/views/organizations/_org_course_poll.html.erb b/app/views/organizations/_org_course_poll.html.erb index c124e829f..fff50786e 100644 --- a/app/views/organizations/_org_course_poll.html.erb +++ b/app/views/organizations/_org_course_poll.html.erb @@ -16,7 +16,7 @@ <%= link_to activity.try(:user).try(:realname), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %> <% end %> TO - <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue ml15" %> + <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", Setting.host_name + "/poll?polls_type=Course&polls_group_id=" + activity.polls_group_id.to_s, :class => "newsBlue ml15" %>
    • diff --git a/app/views/users/_watch_btn_for_picture.html.erb b/app/views/users/_watch_btn_for_picture.html.erb index e604be318..be8673468 100644 --- a/app/views/users/_watch_btn_for_picture.html.erb +++ b/app/views/users/_watch_btn_for_picture.html.erb @@ -2,8 +2,8 @@ <%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn") %> <% else %> <%if(user.watched_by?(User.current))%> - <%= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>user.id,:target_id=>user.id),:class => "userFollow mr27 fl", :method => "delete",:remote => "true", :title => "取消关注"%> + <%= link_to "取消关注",Setting.host_name + "/watch?object_type=user&object_id="+user.id.to_s + "&target_id="+user.id.to_s,:class => "userFollow mr27 fl", :method => "delete",:remote => "true", :title => "取消关注"%> <% else %> - <%= link_to "添加关注",watch_path(:object_type=> 'user',:object_id=>user.id,:target_id=>user.id),:class => "userFollow mr27 fl", :method => "post",:remote => "true", :title => "添加关注"%> + <%= link_to "添加关注",Setting.host_name + "/watch?object_type=user&object_id="+user.id.to_s + "&target_id="+user.id.to_s,:class => "userFollow mr27 fl", :method => "post",:remote => "true", :title => "添加关注"%> <% end %> <% end %> \ No newline at end of file