jro_apps/redmine Commit - r3282:597725d77ce0

Separated ReportsController#issue_report into two separate actions....

Eric Davis -

r3282:597725d77ce0

parent child

Context file:

r3282:597725d77ce0

Collapse all files

app/controllers/reports_controller.rb +24 -18

             # redMine - project management software
             # Copyright (C) 2006  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.
             class ReportsController < ApplicationController
               menu_item :issues
               before_filter :find_project, :authorize
               def issue_report
                 @statuses = IssueStatus.find(:all, :order => 'position')
+                @trackers = @project.trackers
+                @versions = @project.shared_versions.sort
+                @priorities = IssuePriority.all
+                @categories = @project.issue_categories
+                @assignees = @project.members.collect { |m| m.user }.sort
+                @authors = @project.members.collect { |m| m.user }.sort
+                @subprojects = @project.descendants.active
+                issues_by_tracker
+                issues_by_version
+                issues_by_priority
+                issues_by_category
+                issues_by_assigned_to
+                issues_by_author
+                issues_by_subproject
+                render :template => "reports/issue_report"
+              end
+              def issue_report_details
+                @statuses = IssueStatus.find(:all, :order => 'position')
                 case params[:detail]
                 when "tracker"
                   @field = "tracker_id"
                   @rows = @project.trackers
                   @data = issues_by_tracker
                   @report_title = l(:field_tracker)
                   render :template => "reports/issue_report_details"
                 when "version"
                   @field = "fixed_version_id"
                   @rows = @project.shared_versions.sort
                   @data = issues_by_version
                   @report_title = l(:field_version)
                   render :template => "reports/issue_report_details"
                 when "priority"
                   @field = "priority_id"
                   @rows = IssuePriority.all
                   @data = issues_by_priority
                   @report_title = l(:field_priority)
                   render :template => "reports/issue_report_details"
                 when "category"
                   @field = "category_id"
                   @rows = @project.issue_categories
                   @data = issues_by_category
                   @report_title = l(:field_category)
                   render :template => "reports/issue_report_details"
                 when "assigned_to"
                   @field = "assigned_to_id"
                   @rows = @project.members.collect { |m| m.user }.sort
                   @data = issues_by_assigned_to
                   @report_title = l(:field_assigned_to)
                   render :template => "reports/issue_report_details"
                 when "author"
                   @field = "author_id"
                   @rows = @project.members.collect { |m| m.user }.sort
                   @data = issues_by_author
                   @report_title = l(:field_author)
                   render :template => "reports/issue_report_details"
                 when "subproject"
                   @field = "project_id"
                   @rows = @project.descendants.active
                   @data = issues_by_subproject
                   @report_title = l(:field_subproject)
                   render :template => "reports/issue_report_details"
                 else
-                  @trackers = @project.trackers
+                  redirect_to :action => 'issue_report', :id => @project
-                  @versions = @project.shared_versions.sort
-                  @priorities = IssuePriority.all
-                  @categories = @project.issue_categories
-                  @assignees = @project.members.collect { |m| m.user }.sort
-                  @authors = @project.members.collect { |m| m.user }.sort
-                  @subprojects = @project.descendants.active
-                  issues_by_tracker
-                  issues_by_version
-                  issues_by_priority
-                  issues_by_category
-                  issues_by_assigned_to
-                  issues_by_author
-                  issues_by_subproject
-                  render :template => "reports/issue_report"
                 end
-              end
+              end
             private
               def issues_by_tracker
                 @issues_by_tracker ||= Issue.by_tracker(@project)
               end
               def issues_by_version
                 @issues_by_version ||= Issue.by_version(@project)
               end
               def issues_by_priority
                 @issues_by_priority ||= Issue.by_priority(@project)
               end
               def issues_by_category
                 @issues_by_category ||= Issue.by_category(@project)
               end
               def issues_by_assigned_to
                 @issues_by_assigned_to ||= Issue.by_assigned_to(@project)
               end
               def issues_by_author
                 @issues_by_author ||= Issue.by_author(@project)
               end
               def issues_by_subproject
                 @issues_by_subproject ||= Issue.by_subproject(@project)
                 @issues_by_subproject ||= []
               end
             end

config/routes.rb +3 -3

             ActionController::Routing::Routes.draw do |map|
               # Add your own custom routes here.
               # The priority is based upon order of creation: first created -> highest priority.
               # Here's a sample route:
               # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
               # Keep in mind you can assign values other than :controller and :action
               map.home '', :controller => 'welcome'
               map.signin 'login', :controller => 'account', :action => 'login'
               map.signout 'logout', :controller => 'account', :action => 'logout'
               map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
               map.connect 'help/:ctrl/:page', :controller => 'help'
               map.connect 'time_entries/:id/edit', :action => 'edit', :controller => 'timelog'
               map.connect 'projects/:project_id/time_entries/new', :action => 'edit', :controller => 'timelog'
               map.connect 'projects/:project_id/issues/:issue_id/time_entries/new', :action => 'edit', :controller => 'timelog'
               map.with_options :controller => 'timelog' do |timelog|
                 timelog.connect 'projects/:project_id/time_entries', :action => 'details'
                 timelog.with_options :action => 'details', :conditions => {:method => :get}  do |time_details|
                   time_details.connect 'time_entries'
                   time_details.connect 'time_entries.:format'
                   time_details.connect 'issues/:issue_id/time_entries'
                   time_details.connect 'issues/:issue_id/time_entries.:format'
                   time_details.connect 'projects/:project_id/time_entries.:format'
                   time_details.connect 'projects/:project_id/issues/:issue_id/time_entries'
                   time_details.connect 'projects/:project_id/issues/:issue_id/time_entries.:format'
                 end
                 timelog.connect 'projects/:project_id/time_entries/report', :action => 'report'
                 timelog.with_options :action => 'report',:conditions => {:method => :get} do |time_report|
                   time_report.connect 'time_entries/report'
                   time_report.connect 'time_entries/report.:format'
                   time_report.connect 'projects/:project_id/time_entries/report.:format'
                 end
                 timelog.with_options :action => 'edit', :conditions => {:method => :get} do |time_edit|
                   time_edit.connect 'issues/:issue_id/time_entries/new'
                 end
                 timelog.connect 'time_entries/:id/destroy', :action => 'destroy', :conditions => {:method => :post}
               end
               map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post}
               map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get}
               map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post}
               map.with_options :controller => 'wiki' do |wiki_routes|
                 wiki_routes.with_options :conditions => {:method => :get} do |wiki_views|
                   wiki_views.connect 'projects/:id/wiki/:page', :action => 'special', :page => /page_index|date_index|export/i
                   wiki_views.connect 'projects/:id/wiki/:page', :action => 'index', :page => nil
                   wiki_views.connect 'projects/:id/wiki/:page/edit', :action => 'edit'
                   wiki_views.connect 'projects/:id/wiki/:page/rename', :action => 'rename'
                   wiki_views.connect 'projects/:id/wiki/:page/history', :action => 'history'
                   wiki_views.connect 'projects/:id/wiki/:page/diff/:version/vs/:version_from', :action => 'diff'
                   wiki_views.connect 'projects/:id/wiki/:page/annotate/:version', :action => 'annotate'
                 end
                 wiki_routes.connect 'projects/:id/wiki/:page/:action',
                   :action => /edit|rename|destroy|preview|protect/,
                   :conditions => {:method => :post}
               end
               map.with_options :controller => 'messages' do |messages_routes|
                 messages_routes.with_options :conditions => {:method => :get} do |messages_views|
                   messages_views.connect 'boards/:board_id/topics/new', :action => 'new'
                   messages_views.connect 'boards/:board_id/topics/:id', :action => 'show'
                   messages_views.connect 'boards/:board_id/topics/:id/edit', :action => 'edit'
                 end
                 messages_routes.with_options :conditions => {:method => :post} do |messages_actions|
                   messages_actions.connect 'boards/:board_id/topics/new', :action => 'new'
                   messages_actions.connect 'boards/:board_id/topics/:id/replies', :action => 'reply'
                   messages_actions.connect 'boards/:board_id/topics/:id/:action', :action => /edit|destroy/
                 end
               end
               map.with_options :controller => 'boards' do |board_routes|
                 board_routes.with_options :conditions => {:method => :get} do |board_views|
                   board_views.connect 'projects/:project_id/boards', :action => 'index'
                   board_views.connect 'projects/:project_id/boards/new', :action => 'new'
                   board_views.connect 'projects/:project_id/boards/:id', :action => 'show'
                   board_views.connect 'projects/:project_id/boards/:id.:format', :action => 'show'
                   board_views.connect 'projects/:project_id/boards/:id/edit', :action => 'edit'
                 end
                 board_routes.with_options :conditions => {:method => :post} do |board_actions|
                   board_actions.connect 'projects/:project_id/boards', :action => 'new'
                   board_actions.connect 'projects/:project_id/boards/:id/:action', :action => /edit|destroy/
                 end
               end
               map.with_options :controller => 'documents' do |document_routes|
                 document_routes.with_options :conditions => {:method => :get} do |document_views|
                   document_views.connect 'projects/:project_id/documents', :action => 'index'
                   document_views.connect 'projects/:project_id/documents/new', :action => 'new'
                   document_views.connect 'documents/:id', :action => 'show'
                   document_views.connect 'documents/:id/edit', :action => 'edit'
                 end
                 document_routes.with_options :conditions => {:method => :post} do |document_actions|
                   document_actions.connect 'projects/:project_id/documents', :action => 'new'
                   document_actions.connect 'documents/:id/:action', :action => /destroy|edit/
                 end
               end
               map.with_options :controller => 'issues' do |issues_routes|
                 issues_routes.with_options :conditions => {:method => :get} do |issues_views|
                   issues_views.connect 'issues', :action => 'index'
                   issues_views.connect 'issues.:format', :action => 'index'
                   issues_views.connect 'projects/:project_id/issues', :action => 'index'
                   issues_views.connect 'projects/:project_id/issues.:format', :action => 'index'
                   issues_views.connect 'projects/:project_id/issues/new', :action => 'new'
                   issues_views.connect 'projects/:project_id/issues/gantt', :action => 'gantt'
                   issues_views.connect 'projects/:project_id/issues/calendar', :action => 'calendar'
                   issues_views.connect 'projects/:project_id/issues/:copy_from/copy', :action => 'new'
                   issues_views.connect 'issues/:id', :action => 'show', :id => /\d+/
                   issues_views.connect 'issues/:id.:format', :action => 'show', :id => /\d+/
                   issues_views.connect 'issues/:id/edit', :action => 'edit', :id => /\d+/
                   issues_views.connect 'issues/:id/move', :action => 'move', :id => /\d+/
                 end
                 issues_routes.with_options :conditions => {:method => :post} do |issues_actions|
                   issues_actions.connect 'issues', :action => 'index'
                   issues_actions.connect 'projects/:project_id/issues', :action => 'new'
                   issues_actions.connect 'issues/:id/quoted', :action => 'reply', :id => /\d+/
                   issues_actions.connect 'issues/:id/:action', :action => /edit|move|destroy/, :id => /\d+/
                   issues_actions.connect 'issues.:format', :action => 'new', :format => /xml/
                 end
                 issues_routes.with_options :conditions => {:method => :put} do |issues_actions|
                   issues_actions.connect 'issues/:id.:format', :action => 'edit', :id => /\d+/, :format => /xml/
                 end
                 issues_routes.with_options :conditions => {:method => :delete} do |issues_actions|
                   issues_actions.connect 'issues/:id.:format', :action => 'destroy', :id => /\d+/, :format => /xml/
                 end
                 issues_routes.connect 'issues/:action'
               end
               map.with_options  :controller => 'issue_relations', :conditions => {:method => :post} do |relations|
                 relations.connect 'issues/:issue_id/relations/:id', :action => 'new'
                 relations.connect 'issues/:issue_id/relations/:id/destroy', :action => 'destroy'
               end
-              map.with_options :controller => 'reports', :action => 'issue_report', :conditions => {:method => :get} do |reports|
+              map.with_options :controller => 'reports', :conditions => {:method => :get} do |reports|
-                reports.connect 'projects/:id/issues/report'
+                reports.connect 'projects/:id/issues/report', :action => 'issue_report'
-                reports.connect 'projects/:id/issues/report/:detail'
+                reports.connect 'projects/:id/issues/report/:detail', :action => 'issue_report_details'
               end
               map.with_options :controller => 'news' do |news_routes|
                 news_routes.with_options :conditions => {:method => :get} do |news_views|
                   news_views.connect 'news', :action => 'index'
                   news_views.connect 'projects/:project_id/news', :action => 'index'
                   news_views.connect 'projects/:project_id/news.:format', :action => 'index'
                   news_views.connect 'news.:format', :action => 'index'
                   news_views.connect 'projects/:project_id/news/new', :action => 'new'
                   news_views.connect 'news/:id', :action => 'show'
                   news_views.connect 'news/:id/edit', :action => 'edit'
                 end
                 news_routes.with_options do |news_actions|
                   news_actions.connect 'projects/:project_id/news', :action => 'new'
                   news_actions.connect 'news/:id/edit', :action => 'edit'
                   news_actions.connect 'news/:id/destroy', :action => 'destroy'
                 end
               end
               map.connect 'projects/:id/members/new', :controller => 'members', :action => 'new'
               map.with_options :controller => 'users' do |users|
                 users.with_options :conditions => {:method => :get} do |user_views|
                   user_views.connect 'users', :action => 'index'
                   user_views.connect 'users/:id', :action => 'show', :id => /\d+/
                   user_views.connect 'users/new', :action => 'add'
                   user_views.connect 'users/:id/edit/:tab', :action => 'edit', :tab => nil
                 end
                 users.with_options :conditions => {:method => :post} do |user_actions|
                   user_actions.connect 'users', :action => 'add'
                   user_actions.connect 'users/new', :action => 'add'
                   user_actions.connect 'users/:id/edit', :action => 'edit'
                   user_actions.connect 'users/:id/memberships', :action => 'edit_membership'
                   user_actions.connect 'users/:id/memberships/:membership_id', :action => 'edit_membership'
                   user_actions.connect 'users/:id/memberships/:membership_id/destroy', :action => 'destroy_membership'
                 end
               end
               map.with_options :controller => 'projects' do |projects|
                 projects.with_options :conditions => {:method => :get} do |project_views|
                   project_views.connect 'projects', :action => 'index'
                   project_views.connect 'projects.:format', :action => 'index'
                   project_views.connect 'projects/new', :action => 'add'
                   project_views.connect 'projects/:id', :action => 'show'
                   project_views.connect 'projects/:id.:format', :action => 'show'
                   project_views.connect 'projects/:id/:action', :action => /roadmap|destroy|settings/
                   project_views.connect 'projects/:id/files', :action => 'list_files'
                   project_views.connect 'projects/:id/files/new', :action => 'add_file'
                   project_views.connect 'projects/:id/versions/new', :action => 'add_version'
                   project_views.connect 'projects/:id/categories/new', :action => 'add_issue_category'
                   project_views.connect 'projects/:id/settings/:tab', :action => 'settings'
                 end
                 projects.with_options :action => 'activity', :conditions => {:method => :get} do |activity|
                   activity.connect 'projects/:id/activity'
                   activity.connect 'projects/:id/activity.:format'
                   activity.connect 'activity', :id => nil
                   activity.connect 'activity.:format', :id => nil
                 end
                 projects.with_options :conditions => {:method => :post} do |project_actions|
                   project_actions.connect 'projects/new', :action => 'add'
                   project_actions.connect 'projects', :action => 'add'
                   project_actions.connect 'projects.:format', :action => 'add', :format => /xml/
                   project_actions.connect 'projects/:id/:action', :action => /edit|destroy|archive|unarchive/
                   project_actions.connect 'projects/:id/files/new', :action => 'add_file'
                   project_actions.connect 'projects/:id/versions/new', :action => 'add_version'
                   project_actions.connect 'projects/:id/categories/new', :action => 'add_issue_category'
                   project_actions.connect 'projects/:id/activities/save', :action => 'save_activities'
                 end
                 projects.with_options :conditions => {:method => :put} do |project_actions|
                   project_actions.conditions 'projects/:id.:format', :action => 'edit', :format => /xml/
                 end
                 projects.with_options :conditions => {:method => :delete} do |project_actions|
                   project_actions.conditions 'projects/:id.:format', :action => 'destroy', :format => /xml/
                   project_actions.conditions 'projects/:id/reset_activities', :action => 'reset_activities'
                 end
               end
               map.with_options :controller => 'versions' do |versions|
                 versions.with_options :conditions => {:method => :post} do |version_actions|
                   version_actions.connect 'projects/:project_id/versions/close_completed', :action => 'close_completed'
                 end
               end
               map.with_options :controller => 'repositories' do |repositories|
                 repositories.with_options :conditions => {:method => :get} do |repository_views|
                   repository_views.connect 'projects/:id/repository', :action => 'show'
                   repository_views.connect 'projects/:id/repository/edit', :action => 'edit'
                   repository_views.connect 'projects/:id/repository/statistics', :action => 'stats'
                   repository_views.connect 'projects/:id/repository/revisions', :action => 'revisions'
                   repository_views.connect 'projects/:id/repository/revisions.:format', :action => 'revisions'
                   repository_views.connect 'projects/:id/repository/revisions/:rev', :action => 'revision'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/diff', :action => 'diff'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/diff.:format', :action => 'diff'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/raw/*path', :action => 'entry', :format => 'raw', :requirements => { :rev => /[a-z0-9\.\-_]+/ }
                   repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path', :requirements => { :rev => /[a-z0-9\.\-_]+/ }
                   repository_views.connect 'projects/:id/repository/raw/*path', :action => 'entry', :format => 'raw'
                   # TODO: why the following route is required?
                   repository_views.connect 'projects/:id/repository/entry/*path', :action => 'entry'
                   repository_views.connect 'projects/:id/repository/:action/*path'
                 end
                 repositories.connect 'projects/:id/repository/:action', :conditions => {:method => :post}
               end
               map.connect 'attachments/:id', :controller => 'attachments', :action => 'show', :id => /\d+/
               map.connect 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/
               map.connect 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/
               map.resources :groups
               #left old routes at the bottom for backwards compat
               map.connect 'projects/:project_id/issues/:action', :controller => 'issues'
               map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
               map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
               map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
               map.connect 'wiki/:id/:page/:action', :page => nil, :controller => 'wiki'
               map.connect 'issues/:issue_id/relations/:action/:id', :controller => 'issue_relations'
               map.connect 'projects/:project_id/news/:action', :controller => 'news'
               map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog', :project_id => /.+/
               map.with_options :controller => 'repositories' do |omap|
                 omap.repositories_show 'repositories/browse/:id/*path', :action => 'browse'
                 omap.repositories_changes 'repositories/changes/:id/*path', :action => 'changes'
                 omap.repositories_diff 'repositories/diff/:id/*path', :action => 'diff'
                 omap.repositories_entry 'repositories/entry/:id/*path', :action => 'entry'
                 omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
                 omap.connect 'repositories/revision/:id/:rev', :action => 'revision'
               end
               map.with_options :controller => 'sys' do |sys|
                 sys.connect 'sys/projects.:format', :action => 'projects', :conditions => {:method => :get}
                 sys.connect 'sys/projects/:id/repository.:format', :action => 'create_project_repository', :conditions => {:method => :post}
               end
               # Install the default route as the lowest priority.
               map.connect ':controller/:action/:id'
               map.connect 'robots.txt', :controller => 'welcome', :action => 'robots'
               # Used for OpenID
               map.root :controller => 'account', :action => 'login'
             end

lib/redmine.rb +1 -1

             require 'redmine/access_control'
             require 'redmine/menu_manager'
             require 'redmine/activity'
             require 'redmine/mime_type'
             require 'redmine/core_ext'
             require 'redmine/themes'
             require 'redmine/hook'
             require 'redmine/plugin'
             require 'redmine/wiki_formatting'
             begin
               require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
             rescue LoadError
               # RMagick is not available
             end
             if RUBY_VERSION < '1.9'
               require 'faster_csv'
             else
               require 'csv'
               FCSV = CSV
             end
             REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar Git Filesystem )
             # Permissions
             Redmine::AccessControl.map do |map|
               map.permission :view_project, {:projects => [:show, :activity]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
               map.permission :add_project, {:projects => :add}, :require => :loggedin
               map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member
               map.permission :manage_versions, {:projects => [:settings, :add_version], :versions => [:edit, :close_completed, :destroy]}, :require => :member
               map.permission :add_subprojects, {:projects => :add}, :require => :member
               map.project_module :issue_tracking do |map|
                 # Issue categories
                 map.permission :manage_categories, {:projects => [:settings, :add_issue_category], :issue_categories => [:edit, :destroy]}, :require => :member
                 # Issues
                 map.permission :view_issues, {:projects => :roadmap,
                                               :issues => [:index, :changes, :show, :context_menu],
                                               :versions => [:show, :status_by],
                                               :queries => :index,
-                                              :reports => :issue_report}
+                                              :reports => [:issue_report, :issue_report_details]}
                 map.permission :add_issues, {:issues => [:new, :update_form]}
                 map.permission :edit_issues, {:issues => [:edit, :reply, :bulk_edit, :update_form]}
                 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
                 map.permission :add_issue_notes, {:issues => [:edit, :reply]}
                 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :move_issues, {:issues => :move}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries
                 map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
                 map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
                 # Gantt & calendar
                 map.permission :view_gantt, :issues => :gantt
                 map.permission :view_calendar, :issues => :calendar
                 # Watchers
                 map.permission :view_issue_watchers, {}
                 map.permission :add_issue_watchers, {:watchers => :new}
                 map.permission :delete_issue_watchers, {:watchers => :destroy}
               end
               map.project_module :time_tracking do |map|
                 map.permission :log_time, {:timelog => :edit}, :require => :loggedin
                 map.permission :view_time_entries, :timelog => [:details, :report]
                 map.permission :edit_time_entries, {:timelog => [:edit, :destroy]}, :require => :member
                 map.permission :edit_own_time_entries, {:timelog => [:edit, :destroy]}, :require => :loggedin
                 map.permission :manage_project_activities, {:projects => [:save_activities, :reset_activities]}, :require => :member
               end
               map.project_module :news do |map|
                 map.permission :manage_news, {:news => [:new, :edit, :destroy, :destroy_comment]}, :require => :member
                 map.permission :view_news, {:news => [:index, :show]}, :public => true
                 map.permission :comment_news, {:news => :add_comment}
               end
               map.project_module :documents do |map|
                 map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment]}, :require => :loggedin
                 map.permission :view_documents, :documents => [:index, :show, :download]
               end
               map.project_module :files do |map|
                 map.permission :manage_files, {:projects => :add_file}, :require => :loggedin
                 map.permission :view_files, :projects => :list_files, :versions => :download
               end
               map.project_module :wiki do |map|
                 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                 map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
                 map.permission :view_wiki_pages, :wiki => [:index, :special]
                 map.permission :export_wiki_pages, {}
                 map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
                 map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment]
                 map.permission :delete_wiki_pages_attachments, {}
                 map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
               end
               map.project_module :repository do |map|
                 map.permission :manage_repository, {:repositories => [:edit, :committers, :destroy]}, :require => :member
                 map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
                 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
                 map.permission :commit_access, {}
               end
               map.project_module :boards do |map|
                 map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
                 map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
                 map.permission :add_messages, {:messages => [:new, :reply, :quote]}
                 map.permission :edit_messages, {:messages => :edit}, :require => :member
                 map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin
                 map.permission :delete_messages, {:messages => :destroy}, :require => :member
                 map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
               end
             end
             Redmine::MenuManager.map :top_menu do |menu|
               menu.push :home, :home_path
               menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
               menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural
               menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true
               menu.push :help, Redmine::Info.help_url, :last => true
             end
             Redmine::MenuManager.map :account_menu do |menu|
               menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
               menu.push :register, { :controller => 'account', :action => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
               menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
               menu.push :logout, :signout_path, :if => Proc.new { User.current.logged? }
             end
             Redmine::MenuManager.map :application_menu do |menu|
               # Empty
             end
             Redmine::MenuManager.map :admin_menu do |menu|
               # Empty
             end
             Redmine::MenuManager.map :project_menu do |menu|
               menu.push :overview, { :controller => 'projects', :action => 'show' }
               menu.push :activity, { :controller => 'projects', :action => 'activity' }
               menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' },
                           :if => Proc.new { |p| p.shared_versions.any? }
               menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
               menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
                           :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
               menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
               menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
               menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil },
                           :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
               menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
               menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_file_plural
               menu.push :repository, { :controller => 'repositories', :action => 'show' },
                           :if => Proc.new { |p| p.repository && !p.repository.new_record? }
               menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
             end
             Redmine::Activity.map do |activity|
               activity.register :issues, :class_name => %w(Issue Journal)
               activity.register :changesets
               activity.register :news
               activity.register :documents, :class_name => %w(Document Attachment)
               activity.register :files, :class_name => 'Attachment'
               activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
               activity.register :messages, :default => false
               activity.register :time_entries, :default => false
             end
             Redmine::WikiFormatting.map do |format|
               format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
             end

test/functional/reports_controller_test.rb +25 -5

             # Redmine - project management software
             # Copyright (C) 2006-2009  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.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'reports_controller'
             # Re-raise errors caught by the controller.
             class ReportsController; def rescue_action(e) raise e end; end
             class ReportsControllerTest < ActionController::TestCase
               fixtures :all
               def setup
                 @controller = ReportsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               context "GET :issue_report without details" do
                 setup do
                   get :issue_report, :id => 1
                 end
                 should_respond_with :success
                 should_render_template :issue_report
                 [:issues_by_tracker, :issues_by_version, :issues_by_category, :issues_by_assigned_to,
                  :issues_by_author, :issues_by_subproject].each do |ivar|
                   should_assign_to ivar
                   should "set a value for #{ivar}" do
                     assert assigns[ivar.to_s].present?
                   end
                 end
               end
-              def test_issue_report_details
+              context "GET :issue_report_details" do
                 %w(tracker version priority category assigned_to author subproject).each do |detail|
-                  get :issue_report, :id => 1, :detail => detail
+                  context "for #{detail}" do
-                  assert_response :success
+                    setup do
-                  assert_template 'issue_report_details'
+                      get :issue_report_details, :id => 1, :detail => detail
+                    end
+                    should_respond_with :success
+                    should_render_template :issue_report_details
+                    should_assign_to :field
+                    should_assign_to :rows
+                    should_assign_to :data
+                    should_assign_to :report_title
+                  end
                 end
+                context "with an invalid detail" do
+                  setup do
+                    get :issue_report_details, :id => 1, :detail => 'invalid'
+                  end
+                  should_respond_with :redirect
+                  should_redirect_to('the issue report') {{:controller => 'reports', :action => 'issue_report', :id => 'ecookbook'}}
+                end
               end
             end

test/integration/routing_test.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2010  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.
             require "test_helper"
             class RoutingTest < ActionController::IntegrationTest
               context "issue reports" do
                 should_route :get, "/projects/567/issues/report", :controller => 'reports', :action => 'issue_report', :id => '567'
-                should_route :get, "/projects/567/issues/report/assigned_to", :controller => 'reports', :action => 'issue_report', :id => '567', :detail => 'assigned_to'
+                should_route :get, "/projects/567/issues/report/assigned_to", :controller => 'reports', :action => 'issue_report_details', :id => '567', :detail => 'assigned_to'
               end
             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