diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 18d3e9abf..672c18d28 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -286,6 +286,8 @@ class UsersController < ApplicationController @obj = Project.find_by_id(@obj_id) when '3' then @obj = Issue.find_by_id(@obj_id) + when '4' then + @obj = Bid.find_by_id(@obj_id) else @obj = nil end diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb index 6e0df0387..0c243aa54 100644 --- a/app/views/avatar/_avatar_form.html.erb +++ b/app/views/avatar/_avatar_form.html.erb @@ -5,20 +5,24 @@ -<%= file_field_tag 'avatar[image]', - :id => nil, - :class => 'file_selector', - :multiple => false, - :onchange => 'addInputAvatar(this);', - :data => { - :max_file_size => Setting.attachment_max_size.to_i.kilobytes, - :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), - :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, - :upload_path => upload_avatar_path(:format => 'js'), - :description_placeholder => nil ,# l(:label_optional_description) - :source_type => source.class.to_s, - :source_id => source.id.to_s - } %> + + +上传图片 + <%= file_field_tag 'avatar[image]', + :id => nil, + :class => 'file_selector', + :multiple => false, + :onchange => 'addInputAvatar(this);', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => upload_avatar_path(:format => 'js'), + :description_placeholder => nil ,# l(:label_optional_description) + :source_type => source.class.to_s, + :source_id => source.id.to_s + } %> + + (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 63ae8dc9e..6f79fd155 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -6,10 +6,7 @@

<%= l(:label_my_account)%>

-<%= labelled_form_for :user, @user, -:url => { :action => "account" }, -:html => { :id => 'my_account_form', -:method => :post } do |f| %> +
+ <%= labelled_form_for :user, @user, + :url => { :action => "account" }, + :html => { :id => 'my_account_form', + :method => :post } do |f| %>