From e12922544a613f96e66064beee0026f30cd425a1 Mon Sep 17 00:00:00 2001 From: yanxd Date: Fri, 27 Dec 2013 09:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=BE=E6=8E=A5bug=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=8A=A8=E6=80=81=E9=87=8C=E7=9A=84=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/welcome_helper.rb | 2 +- app/views/layouts/base_projects.html.erb | 2 +- app/views/projects/show.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index ff2801a53..cce439d79 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -135,7 +135,7 @@ module WelcomeHelper # } # user_objs = User.find_by_sql("SELECT * FROM users WHERE (users.id IN #{"(" << users.join(',') << ")"} )") activity = Redmine::Activity::Fetcher.new(nil) - activity.scope_select{|t| ['changesets'].include?(t) ? nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' } + activity.scope_select{|t| ['changesets', 'documents'].include?(t) ? nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' } activity.events_welcome(nil, nil, {:limit => limit, :types => 'welcome'}) end diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 6e184fa25..682791923 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -76,7 +76,7 @@ <% end %> <%=link_to "#{@project.members.count}", project_member_path(@project) %> - <%=link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist" %> + <%=link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist", :id => @project %> <%=link_to "#{@project.issues.count}", project_issues_path(@project) %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 3436d62be..096db3218 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -21,7 +21,7 @@ <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> <%= l(:label_new_activity) %> - <%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), e.event_type.eql?("attachment") ? project_files_path(e.container) : e.event_url %> + <%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>