diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index 73eb31068..7d7861c16 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -608,6 +608,7 @@ class BidsController < ApplicationController end end +# added by bai def update_contest @bid = Bid.find(params[:id]) @bid.name = params[:bid][:name] diff --git a/app/views/bids/show_participator.html.erb b/app/views/bids/show_participator.html.erb index 80492de32..da62436b9 100644 --- a/app/views/bids/show_participator.html.erb +++ b/app/views/bids/show_participator.html.erb @@ -12,7 +12,7 @@ :title => "#{user.show_name}" %>
<%= content_tag "div", link_to_user(user.show_name), :class => "project_avatar_name" ,
+ <%= content_tag "div", link_to(user.show_name, user_path(user)), :class => "project_avatar_name" ,
:title => "#{user.show_name}" %>
diff --git a/app/views/projects/_member_list.html.erb b/app/views/projects/_member_list.html.erb
index 9702fb526..9143ae971 100644
--- a/app/views/projects/_member_list.html.erb
+++ b/app/views/projects/_member_list.html.erb
@@ -6,7 +6,7 @@
<%= content_tag "p", "#{format_date(member.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %>
<% end %>
<%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :class => 'avatar')) %>
- <%= content_tag "div", link_to_user(member.user.show_name), :class => "nomargin avatar_name" %>
+ <%= content_tag "div", link_to(member.user.show_name, user_path(member.user)), :class => "nomargin avatar_name" %>
<%= l(:label_bidding_user_studentcode) %> :<%= member.user.user_extensions.student_id%>
<% if @project.project_type == 1 %>
|
diff --git a/config/routes.rb b/config/routes.rb
index 2e897b4ef..dd1af90c7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -475,7 +475,7 @@ RedmineApp::Application.routes.draw do
delete 'calls/:id/join_in_contest', :to => 'bids#unjoin_in_contest'
match 'calls/:id/show_participator', :to => 'bids#show_participator' #bai
match 'calls/:id/update_contest', :to => 'bids#update_contest' #bai
- match 'calls/:id/settings', :to => 'bids#settings'
+ match 'calls/:id/settings', :to => 'bids#settings' #bai
delete 'attachment/:id', :to => 'attachments#delete_homework'
match 'new_join', :to => 'projects#new_join', :as => 'try_join'
|