jro_apps/redmine Commit - r2086:50794b08a925

Cross-project gantt and calendar (#1157)....

Jean-Philippe Lang -

r2086:50794b08a925

parent child

Context file:

r2086:50794b08a925

Collapse all files

app/controllers/issues_controller.rb +7 -7

                before_filter :find_issue, :only => [:show, :edit, :reply, :destroy_attachment]
                before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
-               before_filter :find_project, :only => [:new, :update_form, :preview, :gantt, :calendar]
-               before_filter :authorize, :except => [:index, :changes, :preview, :update_form, :context_menu]
-               before_filter :find_optional_project, :only => [:index, :changes]
+               before_filter :find_project, :only => [:new, :update_form, :preview]
+               before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :update_form, :context_menu]
+               before_filter :find_optional_project, :only => [:index, :changes, :gantt, :calendar]
                accept_key_auth :index, :changes
                helper :journals
                  respond_to do |format|
                    format.html { render :template => "issues/gantt.rhtml", :layout => !request.xhr? }
                    format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{@project.identifier}-gantt.png") } if @gantt.respond_to?('to_image')
-                   format.pdf  { send_data(render(:template => "issues/gantt.rfpdf", :layout => false), :type => 'application/pdf', :filename => "#{@project.identifier}-gantt.pdf") }
+                   format.pdf  { send_data(render(:template => "issues/gantt.rfpdf", :layout => false), :type => 'application/pdf', :filename => "#{@project.nil? ? '' : "#{@project.identifier}-" }gantt.pdf") }
                  end
                end
                end
                def find_optional_project
-                 return true unless params[:project_id]
-                 @project = Project.find(params[:project_id])
-                 authorize
+                 @project = Project.find(params[:project_id]) unless params[:project_id].blank?
+                 allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
+                 allowed ? true : deny_access
                rescue ActiveRecord::RecordNotFound
                  render_404
                end

app/views/issues/_sidebar.rhtml +5 -6

              <% if @project %>
              <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
              <%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %>
+             <% end %>
              <% planning_links = []
-               planning_links << link_to_if_authorized(l(:label_calendar), :action => 'calendar', :project_id => @project)
-               planning_links << link_to_if_authorized(l(:label_gantt), :action => 'gantt', :project_id => @project)
-               planning_links.compact!
-               unless planning_links.empty? %>
+               planning_links << link_to(l(:label_calendar), :action => 'calendar', :project_id => @project) if User.current.allowed_to?(:view_calendar, @project, :global => true)
+               planning_links << link_to(l(:label_gantt), :action => 'gantt', :project_id => @project) if User.current.allowed_to?(:view_gantt, @project, :global => true)
+             %>
+             <% unless planning_links.empty? %>
              <h3><%= l(:label_planning) %></h3>
              <p><%= planning_links.join(' | ') %></p>
              <% end %>
-             <% end %>
              <% unless sidebar_queries.empty? -%>
              <h3><%= l(:label_query_plural) %></h3>

app/views/issues/gantt.rfpdf +2 -2

              <%
              pdf=IfpdfHelper::IFPDF.new(current_language)
-             pdf.SetTitle("#{@project.name} - #{l(:label_gantt)}")
+             pdf.SetTitle("#{l(:label_gantt)} #{@project}")
              pdf.AliasNbPages
              pdf.footer_date = format_date(Date.today)
              pdf.AddPage("L")
              pdf.SetFontStyle('B',12)
              pdf.SetX(15)
-             pdf.Cell(70, 20, @project.name)
+             pdf.Cell(70, 20, @project.to_s)
              pdf.Ln
              pdf.SetFontStyle('B',9)

test/functional/issues_controller_test.rb +24 0

                  assert events.include?(i)
                end
+               def test_cross_project_gantt
+                 get :gantt
+                 assert_response :success
+                 assert_template 'gantt.rhtml'
+                 assert_not_nil assigns(:gantt)
+                 events = assigns(:gantt).events
+                 assert_not_nil events
+               end
                def test_gantt_export_to_pdf
                  get :gantt, :project_id => 1, :format => 'pdf'
                  assert_response :success
                  assert_equal 'application/pdf', @response.content_type
                  assert_not_nil assigns(:gantt)
                end
+               def test_cross_project_gantt_export_to_pdf
+                 get :gantt, :format => 'pdf'
+                 assert_response :success
+                 assert_template 'gantt.rfpdf'
+                 assert_equal 'application/pdf', @response.content_type
+                 assert_not_nil assigns(:gantt)
+               end
                if Object.const_defined?(:Magick)
                  def test_gantt_image
                  assert_not_nil assigns(:calendar)
                end
+               def test_cross_project_calendar
+                 get :calendar
+                 assert_response :success
+                 assert_template 'calendar'
+                 assert_not_nil assigns(:calendar)
+               end
                def test_changes
                  get :changes, :project_id => 1
                  assert_response :success

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