From 6c9f5136c08de78bf0966e0e5e6c0c3729d0d776 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Sat, 10 Jan 2015 10:37:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E3=80=8B?= =?UTF-8?q?=20Signed-off-by:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 6 +++--- app/views/layouts/base_newcontest.html.erb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ab796c4e3..0fcf35aff 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -188,9 +188,9 @@ class UsersController < ApplicationController for user in @watcher events << Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 30) end - - - + + + @events_by_day = events.group_by(&:event_date) unless User.current.admin? diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index 6c3721fcf..707a6e69c 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -79,7 +79,7 @@ <%=link_to l(:field_homepage), home_path %> > - <%=l(:label_courses_management_platform)%> + <%=l(:label_contests_management_platform)%> > <%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %>