diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 4679de8d..d6bf74da 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -218,7 +218,7 @@ class UsersController < ApplicationController def info @message = [] if @user == User.current - @message = JournalsForMessage.reference_message(@user.id) + @message = JournalsForMessage.reference_message(@user.id) end unless User.current.admin? diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 7b14eda8..928f8f9b 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -92,6 +92,7 @@
+ <%= l(:label_user_fans) %>
@@ -110,7 +111,11 @@
+ <% if @user == User.current %> + <%= render_menu :user_menu_self %> + <%else%> <%= render_menu :user_menu %> + <%end%>
<%= yield %> <%= call_hook :view_layouts_base_content %> diff --git a/lib/redmine.rb b/lib/redmine.rb index e672e660..d41b6b96 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -266,8 +266,15 @@ end #end #added by young Redmine::MenuManager.map :user_menu do |menu| + menu.push :activity, {:controller => 'users', :action => 'show' } + menu.push :project, {:controller => 'users', :action => 'user_projects'} + menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'} + menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback'} + +end +Redmine::MenuManager.map :user_menu_self do |menu| menu.push :activity, {:controller => 'users', :action => 'show' } - menu.push :user_information, {:controller => 'users', :action => 'info'} + menu.push :user_information, {:controller => 'users', :action => 'info'} menu.push :project, {:controller => 'users', :action => 'user_projects'} menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'} menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback'}