diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 454d15f58..6cc7fd1b8 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -400,12 +400,10 @@ class UsersController < ApplicationController end ###add by huang - def user_watchlist - + def user_watchlist end ###add by huang - def user_fanslist - + def user_fanslist end private diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 23808a27d..75f1421e1 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -18,6 +18,7 @@ class WelcomeController < ApplicationController caches_action :robots + def index @news = News.latest User.current @projects = Project.latest User.current @@ -58,6 +59,13 @@ class WelcomeController < ApplicationController end end end + + #add by huang + @memberships = @user.memberships.all(:conditions => Project.visible_condition(User.current)) + + events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 20) + @events_by_day = events.group_by(&:event_date) + # end diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb index 8c7ca2b93..eb2dcd0d0 100644 --- a/app/views/admin/index.html.erb +++ b/app/views/admin/index.html.erb @@ -1,5 +1,4 @@

<%=l(:label_administration)%>

-
<%= render :partial => 'no_data' if @no_configuration_data %> <%= render :partial => 'menu' %> diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb index 1fd25c0d4..9b6b64b0c 100644 --- a/app/views/layouts/_base_footer.html.erb +++ b/app/views/layouts/_base_footer.html.erb @@ -1,6 +1,7 @@