git-svn-id: http://redmine.rubyforge.org/svn/trunk@51 e93f8b46-1217-0410-a6f0-8f06a73...

diff --git a/redmine/app/controllers/documents_controller.rb b/redmine/app/controllers/documents_controller.rb
index f2693577e7a2fd206c9930c635468be0a7b5d0d8..3107b3ed1cddb8a72e31c6ed6e8fc4ab947e6efd 100644 (file)
--- a/redmine/app/controllers/documents_controller.rb
+++ b/redmine/app/controllers/documents_controller.rb
@@ -40,6 +40,9 @@ class DocumentsController < ApplicationController
     @attachment = @document.attachments.find(params[:attachment_id])\r
     @attachment.increment_download\r
     send_file @attachment.diskfile, :filename => @attachment.filename\r
+  rescue\r
+    flash.now[:notice] = l(:notice_file_not_found)\r
+    render :text => "", :layout => true, :status => 404\r
   end \r
   \r
   def add_attachment\r

diff --git a/redmine/app/controllers/issues_controller.rb b/redmine/app/controllers/issues_controller.rb
index c279e64301d142ad8882fc4b6536091de2f572c2..45b4fe6335f7eb652a460815f0b4cf62a20457a8 100644 (file)
--- a/redmine/app/controllers/issues_controller.rb
+++ b/redmine/app/controllers/issues_controller.rb
@@ -119,6 +119,9 @@ class IssuesController < ApplicationController
   def download\r
     @attachment = @issue.attachments.find(params[:attachment_id])\r
     send_file @attachment.diskfile, :filename => @attachment.filename\r
+  rescue\r
+    flash.now[:notice] = l(:notice_file_not_found)\r
+    render :text => "", :layout => true, :status => 404\r
   end\r
 \r
 private\r

diff --git a/redmine/app/controllers/projects_controller.rb b/redmine/app/controllers/projects_controller.rb
index 0198e975fa8d2bb3adb97139a52051ff48521a02..a2b7abb4dcf4ca921467dcbf010268741c3cd922 100644 (file)
--- a/redmine/app/controllers/projects_controller.rb
+++ b/redmine/app/controllers/projects_controller.rb
@@ -395,7 +395,7 @@ class ProjectsController < ApplicationController
       @show_files = 1 \r
     end\r
     \r
-    unless params[:show_documentss] == "0"\r
+    unless params[:show_documents] == "0"\r
       Attachment.find(:all, :joins => "LEFT JOIN documents ON documents.id = attachments.container_id", :conditions => ["attachments.container_type='Document' and documents.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to] ).each { |i|\r
         @events_by_day[i.created_on.to_date] ||= []\r
         @events_by_day[i.created_on.to_date] << i\r

diff --git a/redmine/app/controllers/reports_controller.rb b/redmine/app/controllers/reports_controller.rb
index 4a2f7972e0e4162ee98a77f6c0e3c649d72f0ef8..985c937fce5f79604f5e8f1046de66e89b486315 100644 (file)
--- a/redmine/app/controllers/reports_controller.rb
+++ b/redmine/app/controllers/reports_controller.rb
@@ -60,6 +60,42 @@ class ReportsController < ApplicationController
     end\r
   end  \r
   \r
+  def delays\r
+    @trackers = Tracker.find(:all)\r
+    if request.get?\r
+      @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }\r
+    else\r
+      @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array\r
+    end\r
+    @selected_tracker_ids ||= []    \r
+    @raw = \r
+      ActiveRecord::Base.connection.select_all("SELECT datediff( a.created_on, b.created_on ) as delay, count(a.id) as total\r
+      FROM issue_histories a, issue_histories b, issues i\r
+      WHERE a.status_id =5\r
+      AND a.issue_id = b.issue_id\r
+      AND a.issue_id = i.id\r
+      AND i.tracker_id in (#{@selected_tracker_ids.join(',')})\r
+      AND b.id = (\r
+      SELECT min( c.id )\r
+      FROM issue_histories c\r
+      WHERE b.issue_id = c.issue_id ) \r
+      GROUP BY delay") unless @selected_tracker_ids.empty?    \r
+    @raw ||=[]\r
+    \r
+    @x_from = 0\r
+    @x_to = 0\r
+    @y_from = 0\r
+    @y_to = 0\r
+    @sum_total = 0\r
+    @sum_delay = 0\r
+    @raw.each do |r|\r
+      @x_to = [r['delay'].to_i, @x_to].max\r
+      @y_to = [r['total'].to_i, @y_to].max\r
+      @sum_total = @sum_total + r['total'].to_i\r
+      @sum_delay = @sum_delay + r['total'].to_i * r['delay'].to_i\r
+    end    \r
+  end\r
+  \r
 private\r
        # Find project of id params[:id]\r
        def find_project\r

diff --git a/redmine/app/controllers/versions_controller.rb b/redmine/app/controllers/versions_controller.rb
index 57f56bf892c805e55b7a24b25825f8a5250909b9..d1980d74ff12aa1d39f99379127edb203dea8b09 100644 (file)
--- a/redmine/app/controllers/versions_controller.rb
+++ b/redmine/app/controllers/versions_controller.rb
@@ -39,8 +39,8 @@ class VersionsController < ApplicationController
     @attachment.increment_download\r
     send_file @attachment.diskfile, :filename => @attachment.filename\r
   rescue\r
-    flash[:notice] = l(:notice_file_not_found)\r
-    redirect_to :controller => 'projects', :action => 'list_files', :id => @project\r
+    flash.now[:notice] = l(:notice_file_not_found)\r
+    render :text => "", :layout => true, :status => 404\r
   end \r
   \r
   def destroy_file\r

diff --git a/redmine/app/helpers/ifpdf_helper.rb b/redmine/app/helpers/ifpdf_helper.rb
index e09136db20ca3bb569e922de6a81016efe2eddee..4e7a173f41e0717581c4169f5c2f7542f8b3f521 100644 (file)
--- a/redmine/app/helpers/ifpdf_helper.rb
+++ b/redmine/app/helpers/ifpdf_helper.rb
@@ -20,7 +20,9 @@ require 'iconv'
 module IfpdfHelper\r
 \r
   class IFPDF < FPDF\r
-  \r
+\r
+    attr_accessor :footer_date\r
+      \r
     def Cell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='')\r
       @ic ||= Iconv.new('ISO-8859-1', 'UTF-8')\r
       super w,h,@ic.iconv(txt),border,ln,align,fill,link\r
@@ -32,9 +34,12 @@ module IfpdfHelper
     end\r
     \r
     def Footer\r
+      SetFont('Helvetica', 'I', 8)\r
+      SetY(-15)\r
+      SetX(15)\r
+      Cell(0, 5, @footer_date, 0, 0, 'L')\r
       SetY(-15)\r
       SetX(-30)\r
-      SetFont('Helvetica', 'I', 8)\r
       Cell(0, 5, PageNo().to_s + '/{nb}', 0, 0, 'C')\r
     end\r
     \r

diff --git a/redmine/app/views/issues/export_pdf.rfpdf b/redmine/app/views/issues/export_pdf.rfpdf
index b3756d8c738c05d17baee4a9b31de148adda69f6..a8622dd51f952065e1c1ef595c6bd928dafaf201 100644 (file)
--- a/redmine/app/views/issues/export_pdf.rfpdf
+++ b/redmine/app/views/issues/export_pdf.rfpdf
@@ -1,5 +1,6 @@
 <%     pdf=IfpdfHelper::IFPDF.new\r
        pdf.AliasNbPages\r
+       pdf.footer_date = format_date(Date.today)\r
        pdf.AddPage\r
        \r
        render :partial => 'issues/pdf', :locals => { :pdf => pdf, :issue => @issue }\r

diff --git a/redmine/app/views/projects/activity.rhtml b/redmine/app/views/projects/activity.rhtml
index 84275a6e6a59212d959cc81bb55db238866a3241..670e572aeeed5591752442db938325aa31094df8 100644 (file)
--- a/redmine/app/views/projects/activity.rhtml
+++ b/redmine/app/views/projects/activity.rhtml
@@ -13,7 +13,7 @@
   <%= end_form_tag %>\r
   </div>\r
 <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>\r
-  <h3><%= format_date(day) %></h3>\r
+  <h3><%= day_name(day.cwday) %> <%= format_date(day) %></h3>\r
   <ul>\r
   <% @events_by_day[day].sort {|x,y| y.created_on <=> x.created_on }.each do |e| %>\r
     <li><p>\r

diff --git a/redmine/app/views/projects/changelog.rhtml b/redmine/app/views/projects/changelog.rhtml
index 310a4ad65e49069cab238b665006fb897bf12710..0814564135641a14a25e29f508704cb38c56ee48 100644 (file)
--- a/redmine/app/views/projects/changelog.rhtml
+++ b/redmine/app/views/projects/changelog.rhtml
@@ -17,7 +17,8 @@
    @fixed_issues.each do |issue| %>   \r
     <% unless ver_id == issue.fixed_version_id %>\r
     <% if ver_id %></ul><% end %>\r
-    <p><strong><%= issue.fixed_version.name %></strong> - <%= format_date(issue.fixed_version.effective_date) %><br />\r
+    <h3><%= l(:label_version) %>: <%= issue.fixed_version.name %></h3>\r
+    <p><%= format_date(issue.fixed_version.effective_date) %><br />\r
     <%=h issue.fixed_version.description %></p>\r
     <ul>\r
     <% ver_id = issue.fixed_version_id\r

diff --git a/redmine/app/views/projects/export_issues_pdf.rfpdf b/redmine/app/views/projects/export_issues_pdf.rfpdf
index 46af7550738c2d8a8e77477bead6623d52f37617..2e0acf54bd562b34483b87c805edd28f9ac013ad 100644 (file)
--- a/redmine/app/views/projects/export_issues_pdf.rfpdf
+++ b/redmine/app/views/projects/export_issues_pdf.rfpdf
@@ -1,5 +1,6 @@
 <%     pdf=IfpdfHelper::IFPDF.new\r
        pdf.AliasNbPages\r
+       pdf.footer_date = format_date(Date.today)\r
        pdf.AddPage\r
        @issues.each {|i| \r
                render :partial => 'issues/pdf', :locals => { :pdf => pdf, :issue => i }\r

diff --git a/redmine/app/views/projects/gantt.rfpdf b/redmine/app/views/projects/gantt.rfpdf
index 0ac0d75ff6c8934478b6ce228e4ee3e995374f2c..4da789b18ea8b40bcdca05dc1b61531f89792f23 100644 (file)
--- a/redmine/app/views/projects/gantt.rfpdf
+++ b/redmine/app/views/projects/gantt.rfpdf
@@ -1,7 +1,12 @@
 <%\r
 pdf=IfpdfHelper::IFPDF.new\r
 pdf.AliasNbPages\r
+pdf.footer_date = format_date(Date.today)\r
 pdf.AddPage("L")\r
+pdf.SetFont('Arial','B',12)\r
+pdf.SetX(15)\r
+pdf.Cell(70, 20, @project.name)\r
+pdf.Ln\r
 pdf.SetFont('Arial','B',9)\r
 \r
 subject_width = 70\r
@@ -25,6 +30,8 @@ zoom = (g_width) / (@date_to - @date_from + 1)
 g_height = 120\r
 t_height = g_height + headers_heigth\r
 \r
+y_start = pdf.GetY\r
+\r
 \r
 #\r
 # Months headers\r
@@ -34,7 +41,7 @@ left = subject_width
 height = header_heigth\r
 @months.times do \r
        width = ((month_f >> 1) - month_f) * zoom \r
-       pdf.SetY(20)\r
+       pdf.SetY(y_start)\r
        pdf.SetX(left)\r
        pdf.Cell(width, height, "#{month_f.year}-#{month_f.month}", "LTR", 0, "C")\r
        left = left + width\r
@@ -54,14 +61,14 @@ if show_weeks
            # find next monday after @date_from\r
                week_f = @date_from + (7 - @date_from.cwday + 1)\r
                width = (7 - @date_from.cwday + 1) * zoom-1\r
-               pdf.SetY(25)\r
+               pdf.SetY(y_start + header_heigth)\r
                pdf.SetX(left)\r
                pdf.Cell(width + 1, height, "", "LTR")\r
                left = left + width+1\r
        end\r
        while week_f < @date_to\r
                width = (week_f + 6 <= @date_to) ? 7 * zoom : (@date_to - week_f + 1) * zoom\r
-               pdf.SetY(25)\r
+               pdf.SetY(y_start + header_heigth)\r
                pdf.SetX(left)\r
                pdf.Cell(width, height, week_f.cweek.to_s, "LTR", 0, "C")\r
                left = left + width\r
@@ -79,7 +86,7 @@ if show_days
        pdf.SetFont('Arial','B',7)\r
        (@date_to - @date_from + 1).to_i.times do \r
                width = zoom\r
-               pdf.SetY(30)\r
+               pdf.SetY(y_start + 2 * header_heigth)\r
                pdf.SetX(left)\r
                pdf.Cell(width, height, day_name(wday)[0,1], "LTR", 0, "C")\r
                left = left + width\r
@@ -88,7 +95,7 @@ if show_days
        end\r
 end\r
 \r
-pdf.SetY(20)\r
+pdf.SetY(y_start)\r
 pdf.SetX(15)\r
 pdf.Cell(subject_width+g_width-15, headers_heigth, "", 1)\r
 \r
@@ -96,7 +103,7 @@ pdf.Cell(subject_width+g_width-15, headers_heigth, "", 1)
 #\r
 # Tasks\r
 #\r
-top = headers_heigth + 20\r
+top = headers_heigth + y_start\r
 pdf.SetFont('Arial','B',7)\r
 @issues.each do |i|\r
        pdf.SetY(top)\r

diff --git a/redmine/app/views/projects/list_issues.rhtml b/redmine/app/views/projects/list_issues.rhtml
index ba6f40f860e7c1d8e9bea0783fbd58aff38d658a..966fe72d0093e8f0611beb375e27ca6a1e13dddd 100644 (file)
--- a/redmine/app/views/projects/list_issues.rhtml
+++ b/redmine/app/views/projects/list_issues.rhtml
@@ -6,17 +6,17 @@
 </small>\r
 </div>\r
 \r
-<form method="post" class="noborder">\r
+<%= start_form_tag :action => 'list_issues' %>\r
 <table cellpadding=2>\r
   <tr>\r
-    <td><small><%=l(:field_status)%>:</small><br /><%= search_filter_tag 'status_id', :class => 'select-small' %></td>\r
-    <td><small><%=l(:field_tracker)%>:</small><br /><%= search_filter_tag 'tracker_id', :class => 'select-small' %></td>\r
-    <td><small><%=l(:field_priority)%>:</small><br /><%= search_filter_tag 'priority_id', :class => 'select-small' %></td>\r
-    <td><small><%=l(:field_category)%>:</small><br /><%= search_filter_tag 'category_id', :class => 'select-small' %></td>\r
-    <td><small><%=l(:field_fixed_version)%>:</small><br /><%= search_filter_tag 'fixed_version_id', :class => 'select-small' %></td>\r
-    <td><small><%=l(:field_author)%>:</small><br /><%= search_filter_tag 'author_id', :class => 'select-small' %></td>\r
-    <td><small><%=l(:field_assigned_to)%>:</small><br /><%= search_filter_tag 'assigned_to_id', :class => 'select-small' %></td>\r
-    <td><small><%=l(:label_subproject_plural)%>:</small><br /><%= search_filter_tag 'subproject_id', :class => 'select-small' %></td>\r
+    <td valign="bottom"><small><%=l(:field_status)%>:</small><br /><%= search_filter_tag 'status_id', :class => 'select-small' %></td>\r
+    <td valign="bottom"><small><%=l(:field_tracker)%>:</small><br /><%= search_filter_tag 'tracker_id', :class => 'select-small' %></td>\r
+    <td valign="bottom"><small><%=l(:field_priority)%>:</small><br /><%= search_filter_tag 'priority_id', :class => 'select-small' %></td>\r
+    <td valign="bottom"><small><%=l(:field_category)%>:</small><br /><%= search_filter_tag 'category_id', :class => 'select-small' %></td>\r
+    <td valign="bottom"><small><%=l(:field_fixed_version)%>:</small><br /><%= search_filter_tag 'fixed_version_id', :class => 'select-small' %></td>\r
+    <td valign="bottom"><small><%=l(:field_author)%>:</small><br /><%= search_filter_tag 'author_id', :class => 'select-small' %></td>\r
+    <td valign="bottom"><small><%=l(:field_assigned_to)%>:</small><br /><%= search_filter_tag 'assigned_to_id', :class => 'select-small' %></td>\r
+    <td valign="bottom"><small><%=l(:label_subproject_plural)%>:</small><br /><%= search_filter_tag 'subproject_id', :class => 'select-small' %></td>\r
     <td valign="bottom">\r
       <%= hidden_field_tag 'set_filter', 1 %>\r
       <%= submit_tag l(:button_apply), :class => 'button-small' %>\r

diff --git a/redmine/app/views/reports/issue_report_details.rhtml b/redmine/app/views/reports/issue_report_details.rhtml
index 6970a36b37f1e69a06aa1684415b81d7ae8695ca..e37d386492537caafa92c76a1799ee815eddef9a 100644 (file)
--- a/redmine/app/views/reports/issue_report_details.rhtml
+++ b/redmine/app/views/reports/issue_report_details.rhtml
@@ -1,6 +1,6 @@
 <h2><%=l(:label_report_plural)%></h2>\r
 \r
-<strong><%=@report_title%></strong>\r
+<h3><%=@report_title%></h3>\r
 <%= render :partial => 'details', :locals => { :data => @data, :field_name => @field, :rows => @rows } %>\r
 <br />\r
 <%= link_to l(:button_back), :action => 'issue_report' %>\r

diff --git a/redmine/app/views/welcome/index.rhtml b/redmine/app/views/welcome/index.rhtml
index 974cc7694e465b28ba514124dbaf42bfc0767297..b4c726fcc8cbb71a026a6a0a837586a375e3d143 100644 (file)
--- a/redmine/app/views/welcome/index.rhtml
+++ b/redmine/app/views/welcome/index.rhtml
@@ -7,7 +7,7 @@
                <% for news in @news %>\r
                        <p>\r
                        <b><%= news.title %></b> (<%= link_to_user news.author %> <%= format_time(news.created_on) %> - <%= news.project.name %>)<br />\r
-                       <%= news.summary %><br />\r
+                       <% unless news.summary.empty? %><%= news.summary %><br /><% end %>\r
                        [<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]\r
                        </p>\r
                        <hr />\r