jro_apps/redmine Commit - r15391:374468e88aab

Merged r15772 (#23472)....

Jean-Philippe Lang -

r15391:374468e88aab

parent child

Context file:

r15391:374468e88aab

Collapse all files

app/helpers/my_helper.rb +1 -1

              # encoding: utf-8
              #
              # Redmine - project management software
              # Copyright (C) 2006-2016  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              module MyHelper
                def calendar_items(startdt, enddt)
                  Issue.visible.
                    where(:project_id => User.current.projects.map(&:id)).
                    where("(start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)", startdt, enddt, startdt, enddt).
                    includes(:project, :tracker, :priority, :assigned_to).
                    references(:project, :tracker, :priority, :assigned_to).
                    to_a
                end
                def documents_items
                  Document.visible.order("#{Document.table_name}.created_on DESC").limit(10).to_a
                end
                def issuesassignedtome_items
                  Issue.visible.open.
                    assigned_to(User.current).
                    limit(10).
                    includes(:status, :project, :tracker, :priority).
                    references(:status, :project, :tracker, :priority).
                    order("#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC")
                end
                def issuesreportedbyme_items
-                 Issue.visible.
+                 Issue.visible.open.
                    where(:author_id => User.current.id).
                    limit(10).
                    includes(:status, :project, :tracker).
                    references(:status, :project, :tracker).
                    order("#{Issue.table_name}.updated_on DESC")
                end
                def issueswatched_items
                  Issue.visible.open.on_active_project.watched_by(User.current.id).recently_updated.limit(10)
                end
                def news_items
                  News.visible.
                    where(:project_id => User.current.projects.map(&:id)).
                    limit(10).
                    includes(:project, :author).
                    references(:project, :author).
                    order("#{News.table_name}.created_on DESC").
                    to_a
                end
                def timelog_items
                  TimeEntry.
                    where("#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", User.current.id, User.current.today - 6, User.current.today).
                    joins(:activity, :project).
                    references(:issue => [:tracker, :status]).
                    includes(:issue => [:tracker, :status]).
                    order("#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC").
                    to_a
                end
              end

app/views/my/blocks/_issuesreportedbyme.html.erb +1 -1

              <% reported_issues = issuesreportedbyme_items %>
              <h3>
                <%= link_to l(:label_reported_issues),
-                     issues_path(:set_filter => 1, :status_id => '*', :author_id => 'me', :sort => 'updated_on:desc') %>
+                     issues_path(:set_filter => 1, :status_id => 'o', :author_id => 'me', :sort => 'updated_on:desc') %>
                (<%= reported_issues.limit(nil).count %>)
              </h3>
              <%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues.to_a } %>
              <% content_for :header_tags do %>
              <%= auto_discovery_link_tag(:atom,
                                          {:controller => 'issues', :action => 'index', :set_filter => 1,
                                           :author_id => 'me', :format => 'atom', :key => User.current.rss_key},
                                          {:title => l(:label_reported_issues)}) %>
              <% end %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages