From c259ada6e1c46b0c7c21bd11bc1a0659da1ede9e Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Thu, 21 Oct 2010 16:07:28 +0000
Subject: [PATCH 01/30] Refactor: rename WikiController#index to #show, it's a
 single resource action

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4266 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/wiki_controller.rb      | 18 ++++++++--------
 app/helpers/application_helper.rb       |  4 ++--
 app/views/wiki/_sidebar.rhtml           |  2 +-
 app/views/wiki/annotate.rhtml           |  4 ++--
 app/views/wiki/date_index.html.erb      |  6 +++---
 app/views/wiki/destroy.rhtml            |  2 +-
 app/views/wiki/diff.rhtml               |  4 ++--
 app/views/wiki/history.rhtml            |  2 +-
 app/views/wiki/page_index.html.erb      |  4 ++--
 app/views/wiki/show.rhtml               |  6 +++---
 config/routes.rb                        |  2 +-
 lib/redmine.rb                          |  4 ++--
 test/functional/wiki_controller_test.rb | 28 ++++++++++++-------------
 test/integration/routing_test.rb        |  4 ++--
 14 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 75902d54..95e1943e 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -22,14 +22,14 @@ class WikiController < ApplicationController
   before_filter :find_wiki, :authorize
   before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]
   
-  verify :method => :post, :only => [:destroy, :protect], :redirect_to => { :action => :index }
+  verify :method => :post, :only => [:destroy, :protect], :redirect_to => { :action => :show }
 
   helper :attachments
   include AttachmentsHelper   
   helper :watchers
-  
+
   # display a page (in editing mode if it doesn't exist)
-  def index
+  def show
     page_title = params[:page]
     @page = @wiki.find_or_new_page(page_title)
     if @page.new_record?
@@ -79,7 +79,7 @@ class WikiController < ApplicationController
         attachments = Attachment.attach_files(@page, params[:attachments])
         render_attachment_warning_if_needed(@page)
         # don't save if text wasn't changed
-        redirect_to :action => 'index', :project_id => @project, :page => @page.title
+        redirect_to :action => 'show', :project_id => @project, :page => @page.title
         return
       end
       #@content.text = params[:content][:text]
@@ -91,7 +91,7 @@ class WikiController < ApplicationController
         attachments = Attachment.attach_files(@page, params[:attachments])
         render_attachment_warning_if_needed(@page)
         call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
-        redirect_to :action => 'index', :project_id => @project, :page => @page.title
+        redirect_to :action => 'show', :project_id => @project, :page => @page.title
       end
     end
   rescue ActiveRecord::StaleObjectError
@@ -107,13 +107,13 @@ class WikiController < ApplicationController
     @original_title = @page.pretty_title
     if request.post? && @page.update_attributes(params[:wiki_page])
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'index', :project_id => @project, :page => @page.title
+      redirect_to :action => 'show', :project_id => @project, :page => @page.title
     end
   end
   
   def protect
     @page.update_attribute :protected, params[:protected]
-    redirect_to :action => 'index', :project_id => @project, :page => @page.title
+    redirect_to :action => 'show', :project_id => @project, :page => @page.title
   end
 
   # show page history
@@ -176,7 +176,7 @@ class WikiController < ApplicationController
       export = render_to_string :action => 'export_multiple', :layout => false
       send_data(export, :type => 'text/html', :filename => "wiki.html")
     else
-      redirect_to :action => 'index', :project_id => @project, :page => nil
+      redirect_to :action => 'show', :project_id => @project, :page => nil
     end
   end
 
@@ -204,7 +204,7 @@ class WikiController < ApplicationController
     return render_403 unless editable?
     attachments = Attachment.attach_files(@page, params[:attachments])
     render_attachment_warning_if_needed(@page)
-    redirect_to :action => 'index', :page => @page.title
+    redirect_to :action => 'show', :page => @page.title
   end
 
 private
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2ac301d5..fb4b84d7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -182,7 +182,7 @@ module ApplicationHelper
       content << "<ul class=\"pages-hierarchy\">\n"
       pages[node].each do |page|
         content << "<li>"
-        content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'index', :project_id => page.project, :page => page.title},
+        content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :page => page.title},
                            :title => (page.respond_to?(:updated_on) ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
         content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
         content << "</li>\n"
@@ -551,7 +551,7 @@ module ApplicationHelper
             when :local; "#{title}.html"
             when :anchor; "##{title}"   # used for single-file wiki export
             else
-              url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :project_id => link_project, :page => Wiki.titleize(page), :anchor => anchor)
+              url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project, :page => Wiki.titleize(page), :anchor => anchor)
             end
           link_to((title || page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
         else
diff --git a/app/views/wiki/_sidebar.rhtml b/app/views/wiki/_sidebar.rhtml
index c6e5e6ab..efb24af0 100644
--- a/app/views/wiki/_sidebar.rhtml
+++ b/app/views/wiki/_sidebar.rhtml
@@ -4,6 +4,6 @@
 
 <h3><%= l(:label_wiki) %></h3>
 
-<%= link_to l(:field_start_page), {:action => 'index', :page => nil} %><br />
+<%= link_to l(:field_start_page), {:action => 'show', :page => nil} %><br />
 <%= link_to l(:label_index_by_title), {:action => 'page_index'} %><br />
 <%= link_to l(:label_index_by_date), {:action => 'date_index'} %><br />
diff --git a/app/views/wiki/annotate.rhtml b/app/views/wiki/annotate.rhtml
index 9d3b3282..1e664fb8 100644
--- a/app/views/wiki/annotate.rhtml
+++ b/app/views/wiki/annotate.rhtml
@@ -6,7 +6,7 @@
 <h2><%= @page.pretty_title %></h2>
 
 <p>
-<%= l(:label_version) %> <%= link_to @annotate.content.version, :action => 'index', :page => @page.title, :version => @annotate.content.version %>
+<%= l(:label_version) %> <%= link_to @annotate.content.version, :action => 'show', :page => @page.title, :version => @annotate.content.version %>
 <em>(<%= @annotate.content.author ? @annotate.content.author.name : "anonyme" %>, <%= format_time(@annotate.content.updated_on) %>)</em>
 </p>
 
@@ -18,7 +18,7 @@
 <% @annotate.lines.each do |line| -%>
 <tr class="bloc-<%= colors[line[0]] %>">
     <th class="line-num"><%= line_num %></th>
-    <td class="revision"><%= link_to line[0], :controller => 'wiki', :action => 'index', :project_id => @project, :page => @page.title, :version => line[0] %></td>
+    <td class="revision"><%= link_to line[0], :controller => 'wiki', :action => 'show', :project_id => @project, :page => @page.title, :version => line[0] %></td>
     <td class="author"><%= h(line[1]) %></td>
     <td class="line-code"><pre><%=h line[2] %></pre></td>
 </tr>
diff --git a/app/views/wiki/date_index.html.erb b/app/views/wiki/date_index.html.erb
index 957c1596..086d8f63 100644
--- a/app/views/wiki/date_index.html.erb
+++ b/app/views/wiki/date_index.html.erb
@@ -12,7 +12,7 @@
 <h3><%= format_date(date) %></h3>
 <ul>
 <% @pages_by_date[date].each do |page| %>
-    <li><%= link_to page.pretty_title, :action => 'index', :page => page.title %></li>
+    <li><%= link_to page.pretty_title, :action => 'show', :page => page.title %></li>
 <% end %>
 </ul>
 <% end %>
@@ -23,11 +23,11 @@
 
 <% unless @pages.empty? %>
 <% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
 	<%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
 <% end %>
 <% end %>
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
 <% end %>
diff --git a/app/views/wiki/destroy.rhtml b/app/views/wiki/destroy.rhtml
index 77f20ef5..83c81fd5 100644
--- a/app/views/wiki/destroy.rhtml
+++ b/app/views/wiki/destroy.rhtml
@@ -15,5 +15,5 @@
 </div>
 
 <%= submit_tag l(:button_apply) %>
-<%= link_to l(:button_cancel), :controller => 'wiki', :action => 'index', :project_id => @project, :page => @page.title %>
+<%= link_to l(:button_cancel), :controller => 'wiki', :action => 'show', :project_id => @project, :page => @page.title %>
 <% end %>
diff --git a/app/views/wiki/diff.rhtml b/app/views/wiki/diff.rhtml
index 9095be56..a9eebdb9 100644
--- a/app/views/wiki/diff.rhtml
+++ b/app/views/wiki/diff.rhtml
@@ -5,10 +5,10 @@
 <h2><%= @page.pretty_title %></h2>
 
 <p>
-<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'index', :page => @page.title, :version => @diff.content_from.version %>
+<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :page => @page.title, :version => @diff.content_from.version %>
 <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
 &#8594;
-<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'index', :page => @page.title, :version => @diff.content_to.version %>/<%= @page.content.version %>
+<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :page => @page.title, :version => @diff.content_to.version %>/<%= @page.content.version %>
 <em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
 </p>
 
diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml
index 3f07d55e..1f73fd17 100644
--- a/app/views/wiki/history.rhtml
+++ b/app/views/wiki/history.rhtml
@@ -19,7 +19,7 @@
 <% line_num = 1 %>
 <% @versions.each do |ver| %>
 <tr class="<%= cycle("odd", "even") %>">
-    <td class="id"><%= link_to ver.version, :action => 'index', :page => @page.title, :version => ver.version %></td>
+    <td class="id"><%= link_to ver.version, :action => 'show', :page => @page.title, :version => ver.version %></td>
     <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
     <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
     <td align="center"><%= format_time(ver.updated_on) %></td>
diff --git a/app/views/wiki/page_index.html.erb b/app/views/wiki/page_index.html.erb
index e85f83b9..7e7155fd 100644
--- a/app/views/wiki/page_index.html.erb
+++ b/app/views/wiki/page_index.html.erb
@@ -16,11 +16,11 @@
 
 <% unless @pages.empty? %>
 <% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
 	<%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
 <% end %>
 <% end %>
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
 <% end %>
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index 690e9102..00feab8b 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -15,11 +15,11 @@
 
 <% if @content.version != @page.content.version %>
     <p>    
-    <%= link_to(('&#171; ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
+    <%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
     <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
     <%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :page => @page.title, :version => @content.version) + ')' if @content.version > 1 %> - 
-    <%= link_to((l(:label_next) + ' &#187;'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
-    <%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %>
+    <%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
+    <%= link_to(l(:label_current_version), :action => 'show', :page => @page.title) %>
     <br />
     <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
     <%=h @content.comments %>
diff --git a/config/routes.rb b/config/routes.rb
index 764d540c..84d00c68 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,7 +32,7 @@ ActionController::Routing::Routes.draw do |map|
       wiki_views.connect 'projects/:project_id/wiki/export', :action => 'export'
       wiki_views.connect 'projects/:project_id/wiki/page_index', :action => 'page_index'
       wiki_views.connect 'projects/:project_id/wiki/date_index', :action => 'date_index'
-      wiki_views.connect 'projects/:project_id/wiki/:page', :action => 'index', :page => nil
+      wiki_views.connect 'projects/:project_id/wiki/:page', :action => 'show', :page => nil
       wiki_views.connect 'projects/:project_id/wiki/:page/edit', :action => 'edit'
       wiki_views.connect 'projects/:project_id/wiki/:page/rename', :action => 'rename'
       wiki_views.connect 'projects/:project_id/wiki/:page/history', :action => 'history'
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 7fe09082..d5825e00 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -111,7 +111,7 @@ Redmine::AccessControl.map 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, :page_index, :date_index]
+    map.permission :view_wiki_pages, :wiki => [:show, :special, :page_index, :date_index]
     map.permission :export_wiki_pages, :wiki => [:export]
     map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
     map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment]
@@ -195,7 +195,7 @@ Redmine::MenuManager.map :project_menu do |menu|
   menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar
   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 }, :param => :project_id,
+  menu.push :wiki, { :controller => 'wiki', :action => 'show', :page => nil }, :param => :project_id,
               :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
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 4eb33ca3..cd8c3448 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -32,7 +32,7 @@ class WikiControllerTest < ActionController::TestCase
   end
   
   def test_show_start_page
-    get :index, :project_id => 'ecookbook'
+    get :show, :project_id => 'ecookbook'
     assert_response :success
     assert_template 'show'
     assert_tag :tag => 'h1', :content => /CookBook documentation/
@@ -45,7 +45,7 @@ class WikiControllerTest < ActionController::TestCase
   end
   
   def test_show_page_with_name
-    get :index, :project_id => 1, :page => 'Another_page'
+    get :show, :project_id => 1, :page => 'Another_page'
     assert_response :success
     assert_template 'show'
     assert_tag :tag => 'h1', :content => /Another page/
@@ -60,20 +60,20 @@ class WikiControllerTest < ActionController::TestCase
     page.content = WikiContent.new(:text => 'Side bar content for test_show_with_sidebar')
     page.save!
     
-    get :index, :project_id => 1, :page => 'Another_page'
+    get :show, :project_id => 1, :page => 'Another_page'
     assert_response :success
     assert_tag :tag => 'div', :attributes => {:id => 'sidebar'},
                               :content => /Side bar content for test_show_with_sidebar/
   end
   
   def test_show_unexistent_page_without_edit_right
-    get :index, :project_id => 1, :page => 'Unexistent page'
+    get :show, :project_id => 1, :page => 'Unexistent page'
     assert_response 404
   end
   
   def test_show_unexistent_page_with_edit_right
     @request.session[:user_id] = 2
-    get :index, :project_id => 1, :page => 'Unexistent page'
+    get :show, :project_id => 1, :page => 'Unexistent page'
     assert_response :success
     assert_template 'edit'
   end
@@ -85,7 +85,7 @@ class WikiControllerTest < ActionController::TestCase
                 :content => {:comments => 'Created the page',
                              :text => "h1. New page\n\nThis is a new page",
                              :version => 0}
-    assert_redirected_to :action => 'index', :project_id => 'ecookbook', :page => 'New_page'
+    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :page => 'New_page'
     page = Project.find(1).wiki.find_page('New page')
     assert !page.new_record?
     assert_not_nil page.content
@@ -176,7 +176,7 @@ class WikiControllerTest < ActionController::TestCase
     post :rename, :project_id => 1, :page => 'Another_page',
                             :wiki_page => { :title => 'Another renamed page',
                                             :redirect_existing_links => 1 }
-    assert_redirected_to :action => 'index', :project_id => 'ecookbook', :page => 'Another_renamed_page'
+    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :page => 'Another_renamed_page'
     wiki = Project.find(1).wiki
     # Check redirects
     assert_not_nil wiki.find_page('Another page')
@@ -188,7 +188,7 @@ class WikiControllerTest < ActionController::TestCase
     post :rename, :project_id => 1, :page => 'Another_page',
                             :wiki_page => { :title => 'Another renamed page',
                                             :redirect_existing_links => "0" }
-    assert_redirected_to :action => 'index', :project_id => 'ecookbook', :page => 'Another_renamed_page'
+    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :page => 'Another_renamed_page'
     wiki = Project.find(1).wiki
     # Check that there's no redirects
     assert_nil wiki.find_page('Another page')
@@ -280,7 +280,7 @@ class WikiControllerTest < ActionController::TestCase
         get :export, :project_id => 'ecookbook'
 
         should_respond_with :redirect
-        should_redirect_to('wiki index') { {:action => 'index', :project_id => @project, :page => nil} }
+        should_redirect_to('wiki index') { {:action => 'show', :project_id => @project, :page => nil} }
       end
     end
   end
@@ -298,7 +298,7 @@ class WikiControllerTest < ActionController::TestCase
   end
   
   def test_not_found
-    get :index, :project_id => 999
+    get :show, :project_id => 999
     assert_response 404
   end
   
@@ -307,7 +307,7 @@ class WikiControllerTest < ActionController::TestCase
     assert !page.protected?
     @request.session[:user_id] = 2
     post :protect, :project_id => 1, :page => page.title, :protected => '1'
-    assert_redirected_to :action => 'index', :project_id => 'ecookbook', :page => 'Another_page'
+    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :page => 'Another_page'
     assert page.reload.protected?
   end
   
@@ -316,13 +316,13 @@ class WikiControllerTest < ActionController::TestCase
     assert page.protected?
     @request.session[:user_id] = 2
     post :protect, :project_id => 1, :page => page.title, :protected => '0'
-    assert_redirected_to :action => 'index', :project_id => 'ecookbook', :page => 'CookBook_documentation'
+    assert_redirected_to :action => 'show', :project_id => 'ecookbook', :page => 'CookBook_documentation'
     assert !page.reload.protected?
   end
   
   def test_show_page_with_edit_link
     @request.session[:user_id] = 2
-    get :index, :project_id => 1
+    get :show, :project_id => 1
     assert_response :success
     assert_template 'show'
     assert_tag :tag => 'a', :attributes => { :href => '/projects/1/wiki/CookBook_documentation/edit' }
@@ -330,7 +330,7 @@ class WikiControllerTest < ActionController::TestCase
   
   def test_show_page_without_edit_link
     @request.session[:user_id] = 4
-    get :index, :project_id => 1
+    get :show, :project_id => 1
     assert_response :success
     assert_template 'show'
     assert_no_tag :tag => 'a', :attributes => { :href => '/projects/1/wiki/CookBook_documentation/edit' }
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 00ab7b38..f44d3c94 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -311,8 +311,8 @@ class RoutingTest < ActionController::IntegrationTest
   end
 
   context "wiki (singular, project's pages)" do
-    should_route :get, "/projects/567/wiki", :controller => 'wiki', :action => 'index', :project_id => '567'
-    should_route :get, "/projects/567/wiki/lalala", :controller => 'wiki', :action => 'index', :project_id => '567', :page => 'lalala'
+    should_route :get, "/projects/567/wiki", :controller => 'wiki', :action => 'show', :project_id => '567'
+    should_route :get, "/projects/567/wiki/lalala", :controller => 'wiki', :action => 'show', :project_id => '567', :page => 'lalala'
     should_route :get, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :project_id => '567', :page => 'my_page'
     should_route :get, "/projects/1/wiki/CookBook_documentation/history", :controller => 'wiki', :action => 'history', :project_id => '1', :page => 'CookBook_documentation'
     should_route :get, "/projects/1/wiki/CookBook_documentation/diff/2/vs/1", :controller => 'wiki', :action => 'diff', :project_id => '1', :page => 'CookBook_documentation', :version => '2', :version_from => '1'

From b26ba17184e5dad4bd71f0d9120363c909e397a3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Oct 2010 14:42:38 +0000
Subject: [PATCH 02/30] Fixed: "Add news" link broken by recent refactoring
 (#6650).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4267 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/news/index.rhtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index c2a227fe..b9cd2b24 100644
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -1,8 +1,8 @@
 <div class="contextual">
-<%= link_to_if_authorized(l(:label_news_new),
-                          new_project_news_path(@project),
-                          :class => 'icon icon-add',
-                          :onclick => 'Element.show("add-news"); Form.Element.focus("news_title"); return false;') if @project %>
+<%= link_to(l(:label_news_new),
+            new_project_news_path(@project),
+            :class => 'icon icon-add',
+            :onclick => 'Element.show("add-news"); Form.Element.focus("news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
 </div>
 
 <div id="add-news" style="display:none;">

From f17c990a77bab4c4ef907f3aebe4191c354c3154 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Oct 2010 14:45:02 +0000
Subject: [PATCH 03/30] Fixed: "Add file" link broken by recent refactoring
 (#6627).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4268 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/files/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 20710402..5a9a5e6f 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= link_to_if_authorized l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add' %>
+<%= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %>
 </div>
 
 <h2><%=l(:label_attachment_plural)%></h2>

From 2589bec48b950c3328562b4d9dc34f60aee29e7b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Oct 2010 14:49:46 +0000
Subject: [PATCH 04/30] Removes duplicate helper introduced in r4072.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4269 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index fb4b84d7..39c2ebda 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -107,11 +107,6 @@ module ApplicationHelper
 
     link_to(text, {:controller => 'repositories', :action => 'revision', :id => project, :rev => revision}, :title => l(:label_revision_id, revision))
   end
-  
-  def link_to_project(project, options={})
-    options[:class] ||= 'project'
-    link_to(h(project), {:controller => 'projects', :action => 'show', :id => project}, :class => options[:class])
-  end
 
   # Generates a link to a project if active
   # Examples:

From 128c92779c72a58ec5b44eac1d9dc2a04de2e252 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Oct 2010 14:57:20 +0000
Subject: [PATCH 05/30] Removes description column from the admin project list
 to get a better looking project tree.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4270 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/admin/projects.rhtml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index 47a2d058..93f6285f 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -19,7 +19,6 @@
 <table class="list">
   <thead><tr>
 	<th><%=l(:label_project)%></th>
-	<th><%=l(:field_description)%></th>
 	<th><%=l(:field_is_public)%></th>
 	<th><%=l(:field_created_on)%></th>
   <th></th>
@@ -27,8 +26,7 @@
   <tbody>
 <% project_tree(@projects) do |project, level| %>
   <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-	<td class="name"><%= link_to_project(project, :action => 'settings') %></td>
-	<td><%= textilizable project.short_description, :project => project %></td>
+	<td class="name"><%= link_to_project(project, {:action => 'settings'}, :title => project.short_description) %></td>
 	<td align="center"><%= checked_image project.is_public? %></td>
 	<td align="center"><%= format_date(project.created_on) %></td>
   <td class="buttons">

From 2fbf7bbcf1af756c4d0de3c7de96194376d33f1d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Oct 2010 15:11:04 +0000
Subject: [PATCH 06/30] Fixes display of archived child projects on the admin
 project list.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4271 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/admin/projects.rhtml     | 2 +-
 public/stylesheets/application.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index 93f6285f..e1f079c4 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -26,7 +26,7 @@
   <tbody>
 <% project_tree(@projects) do |project, level| %>
   <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-	<td class="name"><%= link_to_project(project, {:action => 'settings'}, :title => project.short_description) %></td>
+	<td class="name"><span><%= link_to_project(project, {:action => 'settings'}, :title => project.short_description) %></span></td>
 	<td align="center"><%= checked_image project.is_public? %></td>
 	<td align="center"><%= format_date(project.created_on) %></td>
   <td class="buttons">
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b286ee23..65ad9649 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -113,7 +113,7 @@ table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; }
 
 tr.project td.name a { white-space:nowrap; }
 
-tr.project.idnt td.name a {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
+tr.project.idnt td.name span {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
 tr.project.idnt-1 td.name {padding-left: 0.5em;}
 tr.project.idnt-2 td.name {padding-left: 2em;}
 tr.project.idnt-3 td.name {padding-left: 3.5em;}

From cac3b1e5381d0756ba9bb6bcb356a4b081f3407d Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Fri, 22 Oct 2010 16:20:20 +0000
Subject: [PATCH 07/30] Refactor: split WikiController#edit into #update

update will handle the saving and should be accessed via POST only.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4272 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/wiki_controller.rb      | 62 +++++++++++++++----------
 app/views/wiki/edit.rhtml               |  2 +-
 config/routes.rb                        |  4 +-
 lib/redmine.rb                          |  2 +-
 test/functional/wiki_controller_test.rb |  4 +-
 test/integration/routing_test.rb        |  2 +-
 6 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 95e1943e..1c42ab5c 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -71,34 +71,48 @@ class WikiController < ApplicationController
     @content.text = initial_page_content(@page) if @content.text.blank?
     # don't keep previous comment
     @content.comments = nil
-    if request.get?
-      # To prevent StaleObjectError exception when reverting to a previous version
-      @content.version = @page.content.version
-    else
-      if !@page.new_record? && @content.text == params[:content][:text]
-        attachments = Attachment.attach_files(@page, params[:attachments])
-        render_attachment_warning_if_needed(@page)
-        # don't save if text wasn't changed
-        redirect_to :action => 'show', :project_id => @project, :page => @page.title
-        return
-      end
-      #@content.text = params[:content][:text]
-      #@content.comments = params[:content][:comments]
-      @content.attributes = params[:content]
-      @content.author = User.current
-      # if page is new @page.save will also save content, but not if page isn't a new record
-      if (@page.new_record? ? @page.save : @content.save)
-        attachments = Attachment.attach_files(@page, params[:attachments])
-        render_attachment_warning_if_needed(@page)
-        call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
-        redirect_to :action => 'show', :project_id => @project, :page => @page.title
-      end
-    end
+
+    # To prevent StaleObjectError exception when reverting to a previous version
+    @content.version = @page.content.version
   rescue ActiveRecord::StaleObjectError
     # Optimistic locking exception
     flash[:error] = l(:notice_locking_conflict)
   end
-  
+
+  verify :method => :post, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
+  # Creates a new page or updates an existing one
+  def update
+    @page = @wiki.find_or_new_page(params[:page])    
+    return render_403 unless editable?
+    @page.content = WikiContent.new(:page => @page) if @page.new_record?
+    
+    @content = @page.content_for_version(params[:version])
+    @content.text = initial_page_content(@page) if @content.text.blank?
+    # don't keep previous comment
+    @content.comments = nil
+
+    if !@page.new_record? && params[:content].present? && @content.text == params[:content][:text]
+      attachments = Attachment.attach_files(@page, params[:attachments])
+      render_attachment_warning_if_needed(@page)
+      # don't save if text wasn't changed
+      redirect_to :action => 'show', :project_id => @project, :page => @page.title
+      return
+    end
+    @content.attributes = params[:content]
+    @content.author = User.current
+    # if page is new @page.save will also save content, but not if page isn't a new record
+    if (@page.new_record? ? @page.save : @content.save)
+      attachments = Attachment.attach_files(@page, params[:attachments])
+      render_attachment_warning_if_needed(@page)
+      call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
+      redirect_to :action => 'show', :project_id => @project, :page => @page.title
+    end
+
+  rescue ActiveRecord::StaleObjectError
+    # Optimistic locking exception
+    flash[:error] = l(:notice_locking_conflict)
+  end
+
   # rename a page
   def rename
     return render_403 unless editable?
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 19052a31..b14bfb72 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -1,6 +1,6 @@
 <h2><%=h @page.pretty_title %></h2>
 
-<% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:multipart => true, :id => 'wiki_form'} do |f| %>
+<% form_for :content, @content, :url => {:action => 'update', :page => @page.title}, :html => {:multipart => true, :id => 'wiki_form'} do |f| %>
 <%= f.hidden_field :version %>
 <%= error_messages_for 'content' %>
 
diff --git a/config/routes.rb b/config/routes.rb
index 84d00c68..5676f454 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -41,8 +41,10 @@ ActionController::Routing::Routes.draw do |map|
     end
     
     wiki_routes.connect 'projects/:project_id/wiki/:page/:action', 
-      :action => /edit|rename|destroy|preview|protect/,
+      :action => /rename|destroy|preview|protect/,
       :conditions => {:method => :post}
+
+    wiki_routes.connect 'projects/:project_id/wiki/:page/edit', :action => 'update', :conditions => {:method => :post}
   end
   
   map.with_options :controller => 'messages' do |messages_routes|
diff --git a/lib/redmine.rb b/lib/redmine.rb
index d5825e00..1a4b581c 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -114,7 +114,7 @@ Redmine::AccessControl.map do |map|
     map.permission :view_wiki_pages, :wiki => [:show, :special, :page_index, :date_index]
     map.permission :export_wiki_pages, :wiki => [:export]
     map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
-    map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment]
+    map.permission :edit_wiki_pages, :wiki => [:edit, :update, :preview, :add_attachment]
     map.permission :delete_wiki_pages_attachments, {}
     map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
   end
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index cd8c3448..61e26592 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -80,7 +80,7 @@ class WikiControllerTest < ActionController::TestCase
   
   def test_create_page
     @request.session[:user_id] = 2
-    post :edit, :project_id => 1,
+    post :update, :project_id => 1,
                 :page => 'New page',
                 :content => {:comments => 'Created the page',
                              :text => "h1. New page\n\nThis is a new page",
@@ -96,7 +96,7 @@ class WikiControllerTest < ActionController::TestCase
     @request.session[:user_id] = 2
     assert_difference 'WikiPage.count' do
       assert_difference 'Attachment.count' do
-        post :edit, :project_id => 1,
+        post :update, :project_id => 1,
                     :page => 'New page',
                     :content => {:comments => 'Created the page',
                                  :text => "h1. New page\n\nThis is a new page",
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index f44d3c94..084330c1 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -322,7 +322,7 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'date_index', :project_id => '567'
     should_route :get, "/projects/567/wiki/export", :controller => 'wiki', :action => 'export', :project_id => '567'
     
-    should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :project_id => '567', :page => 'my_page'
+    should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'update', :project_id => '567', :page => 'my_page'
     should_route :post, "/projects/567/wiki/CookBook_documentation/preview", :controller => 'wiki', :action => 'preview', :project_id => '567', :page => 'CookBook_documentation'
     should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :page => 'ladida'
     should_route :post, "/projects/22/wiki/ladida/destroy", :controller => 'wiki', :action => 'destroy', :project_id => '22', :page => 'ladida'

From 432b00df402c36b4fc2c27f5db1d0f8e23975ba9 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Fri, 22 Oct 2010 17:18:11 +0000
Subject: [PATCH 08/30] Add documentation about contributing to Redmine with
 git

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4273 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/git.rdoc | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 doc/git.rdoc

diff --git a/doc/git.rdoc b/doc/git.rdoc
new file mode 100644
index 00000000..739e7df4
--- /dev/null
+++ b/doc/git.rdoc
@@ -0,0 +1,40 @@
+= Contributing to Redmine with git and github
+
+(This is a beta document. If you can improve it, fork it and send a patch/pull request.)
+
+The official repository is at http://github.com/edavis10/redmine
+
+Official branches:
+
+* master - is automatically mirrored to svn trunk. DO NOT COMMIT OR MERGE INTO THIS BRANCH
+* [0.6, 0.7, 0.8, 0.9, 1.0,...]-stable - is automatically mirrored to svn release branches. DO NOT COMMIT OR MERGE INTO THIS BRANCH
+* integration-to-svn-trunk - this branch is a git-only branch that will track master (trunk). Any code in here will be eventually merged into master but it may be rebased as any time (git-svn needs to rebase to commit to svn)
+* integration-to-svn-stable-1.0 - this branch is a git-only branch that will track the 1.0-stable branch in svn.  Any code in here will be eventually merged into master and 1.0-stable but it may be rebased as any time (git-svn needs to rebase to commit to svn)
+
+I (edavis10) might have some other branches on the repository for work in progress.
+
+== Branch naming standards
+
+Redmine has two kinds of development:
+
+* bug fixes
+* new feature development
+
+Both bug fixes and new feature development should be done in a branch named after the issue number on Redmine.org.  So if you are fixing Issue #6244 your branch should be named:
+
+* 6244
+* 6244-sort-people-by-display-name (optional description)
+* issue/6244 (optional "issue" prefix)
+* issue/6244-sort-people-by-display-name (optional prefix and description)
+
+That way when the branch is merged into the Redmine core, the correct issue can be updated.
+
+Longer term feature development might require multiple branches.  Just your best judgment and try to keep the issue id in the name.
+
+If you don't have an issue for your patch, create an issue on redmine.org and say it's a placeholder issue for your work. Better yet, add a brief overview of what you are working on to the issue and you might get some help with it.
+
+== Coding Standards
+
+Follow the coding standards on the Redmine wiki: http://www.redmine.org/wiki/redmine/Coding_Standards#Commits.  Make sure you commit logs conform to the standards, otherwise someone else will have to rewrite them for you and you might lose attribution during the conversion to svn.
+
+

From d9652183f672a4f23fabb0b8921cb85773b25a54 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Oct 2010 17:38:05 +0000
Subject: [PATCH 09/30] Fixed: file upload on wiki page broken by recent
 refactoring (#6724).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4274 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/wiki/show.rhtml        | 2 +-
 config/routes.rb                 | 2 +-
 test/integration/routing_test.rb | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index 00feab8b..f8675608 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -35,7 +35,7 @@
 <div id="wiki_add_attachment">
 <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
                                              :id => 'attach_files_link' %></p>
-<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
+<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :project_id => @project, :page => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
   <div class="box">
   <p><%= render :partial => 'attachments/form' %></p>
   </div>
diff --git a/config/routes.rb b/config/routes.rb
index 5676f454..511e6dc2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -41,7 +41,7 @@ ActionController::Routing::Routes.draw do |map|
     end
     
     wiki_routes.connect 'projects/:project_id/wiki/:page/:action', 
-      :action => /rename|destroy|preview|protect/,
+      :action => /rename|destroy|preview|protect|add_attachment/,
       :conditions => {:method => :post}
 
     wiki_routes.connect 'projects/:project_id/wiki/:page/edit', :action => 'update', :conditions => {:method => :post}
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 084330c1..ea8c71b0 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -327,6 +327,7 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :page => 'ladida'
     should_route :post, "/projects/22/wiki/ladida/destroy", :controller => 'wiki', :action => 'destroy', :project_id => '22', :page => 'ladida'
     should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :project_id => '22', :page => 'ladida'
+    should_route :post, "/projects/22/wiki/ladida/add_attachment", :controller => 'wiki', :action => 'add_attachment', :project_id => '22', :page => 'ladida'
   end
 
   context "wikis (plural, admin setup)" do

From dc26fd215b83a665f9ce2659a406fcc1f1926044 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Fri, 22 Oct 2010 18:20:00 +0000
Subject: [PATCH 10/30] Add ids to some sections of the issue form

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4275 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_form.rhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 136e1dec..7e9a29ee 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -26,11 +26,11 @@
 </div>
 
 <% if @issue.new_record? %>
-<p><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
+<p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
 <% end %>
 
 <% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
-<p><label><%= l(:label_issue_watchers) %></label>
+<p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
 <% @issue.project.users.sort.each do |user| -%>
 <label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watched_by?(user) %> <%=h user %></label>
 <% end -%>

From d0bbe830ad5b14844bdc2c7a85ec9fb6696247fd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Oct 2010 20:32:05 +0000
Subject: [PATCH 11/30] Adds a failing test for #6350.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4276 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/gantts_controller_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb
index 9aba1d5a..2ba4776c 100644
--- a/test/functional/gantts_controller_test.rb
+++ b/test/functional/gantts_controller_test.rb
@@ -20,6 +20,15 @@ class GanttsControllerTest < ActionController::TestCase
       i = Issue.find(2)
       assert_select "div a.issue", /##{i.id}/
     end
+    
+    should "work without issue due dates" do
+      Issue.update_all("due_date = NULL")
+      
+      get :show, :project_id => 1
+      assert_response :success
+      assert_template 'show.html.erb'
+      assert_not_nil assigns(:gantt)
+    end
 
     should "work cross project" do
       get :show

From d8ef4b6f4d815500671dc21d40596219df3baa8d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Oct 2010 20:40:11 +0000
Subject: [PATCH 12/30] Fixed: timelog link in the activity broken by recent
 refactoring (#6702).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4277 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/time_entry.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 9bf97089..b832277d 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -27,7 +27,7 @@ class TimeEntry < ActiveRecord::Base
 
   acts_as_customizable
   acts_as_event :title => Proc.new {|o| "#{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
-                :url => Proc.new {|o| {:controller => 'timelog', :action => 'details', :project_id => o.project, :issue_id => o.issue}},
+                :url => Proc.new {|o| {:controller => 'timelog', :action => 'index', :project_id => o.project, :issue_id => o.issue}},
                 :author => :user,
                 :description => :comments
 

From b1921830de12d48a995e745a4f3401104d5be9f8 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Fri, 22 Oct 2010 21:29:02 +0000
Subject: [PATCH 13/30] Mark the failed test in r4276 as pending. Tests should
 never fail when committed.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4278 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/gantts_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb
index 2ba4776c..ffc799b2 100644
--- a/test/functional/gantts_controller_test.rb
+++ b/test/functional/gantts_controller_test.rb
@@ -21,7 +21,7 @@ class GanttsControllerTest < ActionController::TestCase
       assert_select "div a.issue", /##{i.id}/
     end
     
-    should "work without issue due dates" do
+    should_eventually "work without issue due dates" do
       Issue.update_all("due_date = NULL")
       
       get :show, :project_id => 1

From b7e3f80e14e56d8d776e0fef1807b936d11adfb0 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Fri, 22 Oct 2010 22:10:41 +0000
Subject: [PATCH 14/30] Translation update for en: field_member_of_group and
 field_assigned_to_role

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4279 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/locales/bg.yml    | 5 +++--
 config/locales/bs.yml    | 5 +++--
 config/locales/ca.yml    | 5 +++--
 config/locales/cs.yml    | 5 +++--
 config/locales/da.yml    | 5 +++--
 config/locales/de.yml    | 5 +++--
 config/locales/el.yml    | 5 +++--
 config/locales/en.yml    | 4 ++--
 config/locales/es.yml    | 5 +++--
 config/locales/eu.yml    | 5 +++--
 config/locales/fi.yml    | 5 +++--
 config/locales/fr.yml    | 5 +++--
 config/locales/gl.yml    | 5 +++--
 config/locales/he.yml    | 5 +++--
 config/locales/hr.yml    | 5 +++--
 config/locales/hu.yml    | 5 +++--
 config/locales/id.yml    | 5 +++--
 config/locales/it.yml    | 5 +++--
 config/locales/ja.yml    | 5 +++--
 config/locales/ko.yml    | 5 +++--
 config/locales/lt.yml    | 5 +++--
 config/locales/lv.yml    | 5 +++--
 config/locales/mk.yml    | 5 +++--
 config/locales/mn.yml    | 5 +++--
 config/locales/nl.yml    | 5 +++--
 config/locales/no.yml    | 5 +++--
 config/locales/pl.yml    | 5 +++--
 config/locales/pt-BR.yml | 5 +++--
 config/locales/pt.yml    | 5 +++--
 config/locales/ro.yml    | 5 +++--
 config/locales/ru.yml    | 5 +++--
 config/locales/sk.yml    | 5 +++--
 config/locales/sl.yml    | 5 +++--
 config/locales/sr-YU.yml | 5 +++--
 config/locales/sr.yml    | 5 +++--
 config/locales/sv.yml    | 5 +++--
 config/locales/th.yml    | 5 +++--
 config/locales/tr.yml    | 5 +++--
 config/locales/uk.yml    | 5 +++--
 config/locales/vi.yml    | 5 +++--
 config/locales/zh-TW.yml | 5 +++--
 config/locales/zh.yml    | 5 +++--
 42 files changed, 125 insertions(+), 84 deletions(-)

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 1e94bd90..e6f92cc4 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -906,8 +906,6 @@ bg:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -915,3 +913,6 @@ bg:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index af28090c..f6373516 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -926,8 +926,6 @@ bs:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -935,3 +933,6 @@ bs:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 600923bf..842ef621 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -915,8 +915,6 @@ ca:
   enumeration_activities: Activitats (seguidor de temps)
   enumeration_system_activity: Activitat del sistema
 
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -924,3 +922,6 @@ ca:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 1f287573..d4449cee 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -912,8 +912,6 @@ cs:
   field_time_entries: Zaznamenaný čas
   project_module_gantt: Gantt
   project_module_calendar: Kalendář
-  field_member_of_group: Člen skupiny
-  field_assigned_to_role: Člen role
   button_edit_associated_wikipage: "Upravit přiřazenou Wiki stránku: {{page_title}}"
   text_are_you_sure_with_children: Smazat úkol včetně všech podúkolů?
   field_text: Textové pole
@@ -921,3 +919,6 @@ cs:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 06a2568b..e557721a 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -928,8 +928,6 @@ da:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -937,3 +935,6 @@ da:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 45f710d1..9c9a853d 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -932,11 +932,12 @@ de:
   enumeration_activities: Aktivitäten (Zeiterfassung)
   enumeration_system_activity: System-Aktivität
 
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
   label_user_mail_option_only_owner: Only for things I am the owner of
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 38d2947c..963f30da 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -912,8 +912,6 @@ el:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -921,3 +919,6 @@ el:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8b2a9c94..bdf2e982 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -293,8 +293,8 @@ en:
   field_group_by: Group results by
   field_sharing: Sharing
   field_parent_issue: Parent task
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
+  field_member_of_group: "Assignee's group"
+  field_assigned_to_role: "Assignee's role"
   field_text: Text field
   
   setting_app_title: Application title
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 4e7b0d21..2b08b1dc 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -952,8 +952,6 @@ es:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -961,3 +959,6 @@ es:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 1a639abf..b45bf0e7 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -916,8 +916,6 @@ eu:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -925,3 +923,6 @@ eu:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index bf7d8e87..e4f107e9 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -937,8 +937,6 @@ fi:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -946,3 +944,6 @@ fi:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c2c9a4b4..ec4ca7db 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -930,8 +930,6 @@ fr:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Modifier la page de Wiki associée: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -939,3 +937,6 @@ fr:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 904f3d7c..14f04ab1 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -928,8 +928,6 @@ gl:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -937,3 +935,6 @@ gl:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 997ba378..1fc167e7 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -297,8 +297,6 @@ he:
   field_group_by: קבץ את התוצאות לפי
   field_sharing: שיתוף
   field_parent_issue: משימת אב
-  field_member_of_group: חבר בקבוצה
-  field_assigned_to_role: בעל תפקיד
   field_text: שדה טקסט
 
   setting_app_title: כותרת ישום
@@ -926,3 +924,6 @@ he:
   enumeration_doc_categories: קטגוריות מסמכים
   enumeration_activities: פעילויות (מעקב אחר זמנים)
   enumeration_system_activity: פעילות מערכת
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index f8660eba..725411c9 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -919,8 +919,6 @@ hr:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -928,3 +926,6 @@ hr:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 6a3ed785..767f2d67 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -935,8 +935,6 @@
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -944,3 +942,6 @@
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/id.yml b/config/locales/id.yml
index e4239646..b9136702 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -920,8 +920,6 @@ id:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -929,3 +927,6 @@ id:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/it.yml b/config/locales/it.yml
index dd4a97c2..f39dfbb9 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -916,8 +916,6 @@ it:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -925,3 +923,6 @@ it:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 961626fc..92bfd158 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -319,8 +319,6 @@ ja:
   field_group_by: グループ条件
   field_sharing: 共有
   field_parent_issue: 親チケット
-  field_member_of_group: 担当者のグループ
-  field_assigned_to_role: 担当者のロール
   field_text: テキスト
   
   setting_app_title: アプリケーションのタイトル
@@ -946,3 +944,6 @@ ja:
   enumeration_doc_categories: 文書カテゴリ
   enumeration_activities: 作業分類 (時間トラッキング)
   enumeration_system_activity: システム作業分類
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index f31ed0bb..7cc8ad62 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -968,8 +968,6 @@ ko:
   field_time_entries: 기록된 시간
   project_module_gantt: Gantt 챠트
   project_module_calendar: 달력
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -977,3 +975,6 @@ ko:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index c997f4f2..186c61a3 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -976,8 +976,6 @@ lt:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -985,3 +983,6 @@ lt:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 24aa496b..5c338cd3 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -907,8 +907,6 @@ lv:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -916,3 +914,6 @@ lv:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 68606a3d..6dd1fca2 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -912,8 +912,6 @@ mk:
   enumeration_activities: Активности (следење на време)
   enumeration_system_activity: Системска активност
 
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -921,3 +919,6 @@ mk:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index 4f928aa2..a0f4be9e 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -913,8 +913,6 @@ mn:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -922,3 +920,6 @@ mn:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 1e817aae..ab9fdfad 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -894,8 +894,6 @@ nl:
   field_time_entries: Log tijd
   project_module_gantt: Gantt
   project_module_calendar: Kalender
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -903,3 +901,6 @@ nl:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/no.yml b/config/locales/no.yml
index e02aed73..592af9d6 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -903,8 +903,6 @@
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -912,3 +910,6 @@
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 88b7af23..d1193107 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -933,8 +933,6 @@ pl:
   field_time_entries: Dziennik
   project_module_gantt: Diagram Gantta
   project_module_calendar: Kalendarz
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -942,3 +940,6 @@ pl:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 3978fc1e..f8609304 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -936,8 +936,6 @@ pt-BR:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendário
-  field_member_of_group: Membro do grupo
-  field_assigned_to_role: Membro com o papel
   button_edit_associated_wikipage: "Editar página wiki relacionada: {{page_title}}"
   text_are_you_sure_with_children: Excluir a tarefa e suas subtarefas?
   field_text: Campo de texto
@@ -945,3 +943,6 @@ pt-BR:
   setting_default_notification_option: Opção padrão de notificação
   label_user_mail_option_only_my_events: Somente para as coisas que eu esteja observando ou esteja envolvido
   label_user_mail_option_only_assigned: Somente para as coisas que estejam atribuídas a mim
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index fc777ddb..eb8917e7 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -920,8 +920,6 @@ pt:
   field_time_entries: Tempo registado
   project_module_gantt: Gantt
   project_module_calendar: Calendário
-  field_member_of_group: Membro do Grupo
-  field_assigned_to_role: Membro do Perfil
   button_edit_associated_wikipage: "Editar página Wiki associada: {{page_title}}"
   text_are_you_sure_with_children: Apagar tarefa e todas as sub-tarefas?
   field_text: Text field
@@ -929,3 +927,6 @@ pt:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 7ff797af..b1e311ff 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -905,8 +905,6 @@ ro:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -914,3 +912,6 @@ ro:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 5dbead04..ee6c7042 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -295,7 +295,6 @@ ru:
   field_admin: Администратор
   field_assignable: Задача может быть назначена этой роли
   field_assigned_to: Назначена
-  field_assigned_to_role: Роль участника
   field_attr_firstname: Имя
   field_attr_lastname: Фамилия
   field_attr_login: Атрибут Регистрация
@@ -345,7 +344,6 @@ ru:
   field_mail: Email
   field_mail_notification: Уведомления по email
   field_max_length: Максимальная длина
-  field_member_of_group: Группа участника
   field_min_length: Минимальная длина
   field_name: Имя
   field_new_password: Новый пароль
@@ -1038,3 +1036,6 @@ ru:
   notice_unable_delete_time_entry: Невозможно удалить запись журнала.
   label_overall_spent_time: Всего затрачено времени
 
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 4ba3a306..e49a2149 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -907,8 +907,6 @@ sk:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -916,3 +914,6 @@ sk:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 6094c185..33eade58 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -908,8 +908,6 @@ sl:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -917,3 +915,6 @@ sl:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index e46070ee..0aee7ec5 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -912,8 +912,6 @@ sr-YU:
   field_time_entries: Vreme evidencije
   project_module_gantt: Gantov dijagram
   project_module_calendar: Kalendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -921,3 +919,6 @@ sr-YU:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index a32229ba..b1686eb3 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -912,8 +912,6 @@ sr:
   field_time_entries: Време евиденције
   project_module_gantt: Гантов дијаграм
   project_module_calendar: Календар
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
 
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
@@ -922,3 +920,6 @@ sr:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 67414ca4..0b19956b 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -957,8 +957,6 @@ sv:
   enumeration_doc_categories: Dokumentkategorier
   enumeration_activities: Aktiviteter (tidsuppföljning)
   enumeration_system_activity: Systemaktivitet
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -966,3 +964,6 @@ sv:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/th.yml b/config/locales/th.yml
index e95e317b..d0275afd 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -909,8 +909,6 @@ th:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -918,3 +916,6 @@ th:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 435b711c..32ae9cc4 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -935,8 +935,6 @@ tr:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -944,3 +942,6 @@ tr:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index d3f37d08..28e6caa3 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -908,8 +908,6 @@ uk:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -917,3 +915,6 @@ uk:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 58f2e7c2..84adc162 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -967,8 +967,6 @@ vi:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -976,3 +974,6 @@ vi:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index aac0194b..89ea4886 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -379,8 +379,6 @@
   field_group_by: 結果分組方式
   field_sharing: 共用
   field_parent_issue: 父工作項目
-  field_member_of_group: 所屬群組
-  field_assigned_to_role: 所屬角色
   field_text: 內容文字
   
   setting_app_title: 標題
@@ -1007,3 +1005,6 @@
   enumeration_activities: 活動 (時間追蹤)
   enumeration_system_activity: 系統活動
 
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 167934fd..3439b312 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -930,8 +930,6 @@ zh:
   field_time_entries: Log time
   project_module_gantt: Gantt
   project_module_calendar: Calendar
-  field_member_of_group: Member of Group
-  field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
   field_text: Text field
@@ -939,3 +937,6 @@ zh:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  label_user_mail_option_none: No events
+  field_member_of_group: Assignee's group
+  field_assigned_to_role: Assignee's role

From ed608cb7d39ff1224a4d1cad4b96ba0fa3505947 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Oct 2010 22:13:39 +0000
Subject: [PATCH 15/30] Fixed: error on gantt when no issue have a due date
 (#6350).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4280 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/helpers/gantt.rb              |  6 +++---
 test/functional/gantts_controller_test.rb | 12 +++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
index cec32372..0f86648e 100644
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -283,8 +283,8 @@ module Redmine
       end
 
       def line_for_project(project, options)
-        # Skip versions that don't have a start_date
-        if project.is_a?(Project) && project.start_date
+        # Skip versions that don't have a start_date or due date
+        if project.is_a?(Project) && project.start_date && project.due_date
           options[:zoom] ||= 1
           options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
 
@@ -419,7 +419,7 @@ module Redmine
 
       def line_for_version(version, options)
         # Skip versions that don't have a start_date
-        if version.is_a?(Version) && version.start_date
+        if version.is_a?(Version) && version.start_date && version.due_date
           options[:zoom] ||= 1
           options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
 
diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb
index ffc799b2..4c891c3d 100644
--- a/test/functional/gantts_controller_test.rb
+++ b/test/functional/gantts_controller_test.rb
@@ -21,7 +21,7 @@ class GanttsControllerTest < ActionController::TestCase
       assert_select "div a.issue", /##{i.id}/
     end
     
-    should_eventually "work without issue due dates" do
+    should "work without issue due dates" do
       Issue.update_all("due_date = NULL")
       
       get :show, :project_id => 1
@@ -29,6 +29,16 @@ class GanttsControllerTest < ActionController::TestCase
       assert_template 'show.html.erb'
       assert_not_nil assigns(:gantt)
     end
+    
+    should "work without issue and version due dates" do
+      Issue.update_all("due_date = NULL")
+      Version.update_all("effective_date = NULL")
+      
+      get :show, :project_id => 1
+      assert_response :success
+      assert_template 'show.html.erb'
+      assert_not_nil assigns(:gantt)
+    end
 
     should "work cross project" do
       get :show

From a6f891d1b18446bac798629487c0c55dbaa98220 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Oct 2010 22:29:32 +0000
Subject: [PATCH 16/30] Moves a method to the appropriate helper.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4281 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/gantt_helper.rb  | 27 +++++++++++++++++++++++++++
 app/helpers/issues_helper.rb | 26 --------------------------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/app/helpers/gantt_helper.rb b/app/helpers/gantt_helper.rb
index 38f3765e..97f7646f 100644
--- a/app/helpers/gantt_helper.rb
+++ b/app/helpers/gantt_helper.rb
@@ -16,6 +16,33 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module GanttHelper
+
+  def gantt_zoom_link(gantt, in_or_out)
+    img_attributes = {:style => 'height:1.4em; width:1.4em; margin-left: 3px;'} # em for accessibility
+
+    case in_or_out
+    when :in
+      if gantt.zoom < 4
+        link_to_remote(l(:text_zoom_in) + image_tag('zoom_in.png', img_attributes.merge(:alt => l(:text_zoom_in))),
+                       {:url => gantt.params.merge(:zoom => (gantt.zoom+1)), :method => :get, :update => 'content'},
+                       {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom+1)))})
+      else
+        l(:text_zoom_in) +
+          image_tag('zoom_in_g.png', img_attributes.merge(:alt => l(:text_zoom_in)))
+      end
+      
+    when :out
+      if gantt.zoom > 1
+        link_to_remote(l(:text_zoom_out) + image_tag('zoom_out.png', img_attributes.merge(:alt => l(:text_zoom_out))),
+                       {:url => gantt.params.merge(:zoom => (gantt.zoom-1)), :method => :get, :update => 'content'},
+                       {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom-1)))})
+      else
+        l(:text_zoom_out) +
+          image_tag('zoom_out_g.png', img_attributes.merge(:alt => l(:text_zoom_out)))
+      end
+    end
+  end
+  
   def number_of_issues_on_versions(gantt)
     versions = gantt.events.collect {|event| (event.is_a? Version) ? event : nil}.compact
 
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index d84ec6c9..321041b7 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -246,30 +246,4 @@ module IssuesHelper
     end
     export
   end
-
-  def gantt_zoom_link(gantt, in_or_out)
-    img_attributes = {:style => 'height:1.4em; width:1.4em; margin-left: 3px;'} # em for accessibility
-
-    case in_or_out
-    when :in
-      if gantt.zoom < 4
-        link_to_remote(l(:text_zoom_in) + image_tag('zoom_in.png', img_attributes.merge(:alt => l(:text_zoom_in))),
-                       {:url => gantt.params.merge(:zoom => (gantt.zoom+1)), :method => :get, :update => 'content'},
-                       {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom+1)))})
-      else
-        l(:text_zoom_in) +
-          image_tag('zoom_in_g.png', img_attributes.merge(:alt => l(:text_zoom_in)))
-      end
-      
-    when :out
-      if gantt.zoom > 1
-        link_to_remote(l(:text_zoom_out) + image_tag('zoom_out.png', img_attributes.merge(:alt => l(:text_zoom_out))),
-                       {:url => gantt.params.merge(:zoom => (gantt.zoom-1)), :method => :get, :update => 'content'},
-                       {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom-1)))})
-      else
-        l(:text_zoom_out) +
-          image_tag('zoom_out_g.png', img_attributes.merge(:alt => l(:text_zoom_out)))
-      end
-    end
-  end
 end

From 0ca74df6040371e448bcb3c718b84cdb635f07ee Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Fri, 22 Oct 2010 22:38:45 +0000
Subject: [PATCH 17/30] Refactor: move method to model with compatibility
 wrapper

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4282 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 11 +++--------
 app/models/project.rb             | 12 ++++++++++++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 39c2ebda..38d43e5b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -238,15 +238,10 @@ module ApplicationHelper
   end
   
   # Yields the given block for each project with its level in the tree
+  #
+  # Wrapper for Project#project_tree
   def project_tree(projects, &block)
-    ancestors = []
-    projects.sort_by(&:lft).each do |project|
-      while (ancestors.any? && !project.is_descendant_of?(ancestors.last)) 
-        ancestors.pop
-      end
-      yield project, ancestors.size
-      ancestors << project
-    end
+    Project.project_tree(projects, &block)
   end
   
   def project_nested_ul(projects, &block)
diff --git a/app/models/project.rb b/app/models/project.rb
index 000efa7c..16c97441 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -565,6 +565,18 @@ class Project < ActiveRecord::Base
       return nil
     end
   end
+
+  # Yields the given block for each project with its level in the tree
+  def self.project_tree(projects, &block)
+    ancestors = []
+    projects.sort_by(&:lft).each do |project|
+      while (ancestors.any? && !project.is_descendant_of?(ancestors.last)) 
+        ancestors.pop
+      end
+      yield project, ancestors.size
+      ancestors << project
+    end
+  end
   
   private
   

From a29c35e08f2322d7ed0dc362419009a06b74329c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 23 Oct 2010 09:08:55 +0000
Subject: [PATCH 18/30] Makes zoom buttons on gantt looks like the others.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4283 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/gantt_helper.rb        | 18 ++++++++----------
 app/views/gantts/show.html.erb     |  2 +-
 public/stylesheets/application.css |  2 ++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/helpers/gantt_helper.rb b/app/helpers/gantt_helper.rb
index 97f7646f..b0d9f551 100644
--- a/app/helpers/gantt_helper.rb
+++ b/app/helpers/gantt_helper.rb
@@ -18,27 +18,25 @@
 module GanttHelper
 
   def gantt_zoom_link(gantt, in_or_out)
-    img_attributes = {:style => 'height:1.4em; width:1.4em; margin-left: 3px;'} # em for accessibility
-
     case in_or_out
     when :in
       if gantt.zoom < 4
-        link_to_remote(l(:text_zoom_in) + image_tag('zoom_in.png', img_attributes.merge(:alt => l(:text_zoom_in))),
+        link_to_remote(l(:text_zoom_in),
                        {:url => gantt.params.merge(:zoom => (gantt.zoom+1)), :method => :get, :update => 'content'},
-                       {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom+1)))})
+                       {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom+1))),
+                        :class => 'icon icon-zoom-in'})
       else
-        l(:text_zoom_in) +
-          image_tag('zoom_in_g.png', img_attributes.merge(:alt => l(:text_zoom_in)))
+        content_tag('span', l(:text_zoom_in), :class => 'icon icon-zoom-in')
       end
       
     when :out
       if gantt.zoom > 1
-        link_to_remote(l(:text_zoom_out) + image_tag('zoom_out.png', img_attributes.merge(:alt => l(:text_zoom_out))),
+        link_to_remote(l(:text_zoom_out),
                        {:url => gantt.params.merge(:zoom => (gantt.zoom-1)), :method => :get, :update => 'content'},
-                       {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom-1)))})
+                       {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom-1))),
+                        :class => 'icon icon-zoom-out'})
       else
-        l(:text_zoom_out) +
-          image_tag('zoom_out_g.png', img_attributes.merge(:alt => l(:text_zoom_out)))
+        content_tag('span', l(:text_zoom_out), :class => 'icon icon-zoom-out')
       end
     end
   end
diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
index cb2da5ad..1509261e 100644
--- a/app/views/gantts/show.html.erb
+++ b/app/views/gantts/show.html.erb
@@ -10,7 +10,7 @@
   </div>
 </fieldset>
 
-<p style="float:right;">
+<p class="contextual">
   <%= gantt_zoom_link(@gantt, :in) %>
   <%= gantt_zoom_link(@gantt, :out) %>
 </p>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 65ad9649..f3bbf224 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -854,6 +854,8 @@ padding-bottom: 3px;
 .icon-summary  { background-image: url(../images/lightning.png); }
 .icon-server-authentication { background-image: url(../images/server_key.png); }
 .icon-issue { background-image: url(../images/ticket.png); }
+.icon-zoom-in { background-image: url(../images/zoom_in.png); }
+.icon-zoom-out { background-image: url(../images/zoom_out.png); }
 
 .icon-file { background-image: url(../images/files/default.png); }
 .icon-file.text-plain { background-image: url(../images/files/text.png); }

From 1e4776fa644525168d0e3bfc0e4232f9dc43d42c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 23 Oct 2010 09:22:28 +0000
Subject: [PATCH 19/30] Updated french translation.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4284 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/locales/fr.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ec4ca7db..67848932 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -929,14 +929,14 @@ fr:
   label_overall_spent_time: Temps passé global
   field_time_entries: Log time
   project_module_gantt: Gantt
-  project_module_calendar: Calendar
-  button_edit_associated_wikipage: "Modifier la page de Wiki associée: {{page_title}}"
-  text_are_you_sure_with_children: Delete issue and all child issues?
-  field_text: Text field
-  label_user_mail_option_only_owner: Only for things I am the owner of
-  setting_default_notification_option: Default notification option
-  label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
-  label_user_mail_option_only_assigned: Only for things I am assigned to
-  label_user_mail_option_none: No events
-  field_member_of_group: Assignee's group
-  field_assigned_to_role: Assignee's role
+  project_module_calendar: Calendrier
+  button_edit_associated_wikipage: "Modifier la page wiki associée: {{page_title}}"
+  text_are_you_sure_with_children: Supprimer la demande et toutes ses sous-demandes ?
+  field_text: Champ texte
+  label_user_mail_option_only_owner: Seulement pour ce que j'ai créé
+  setting_default_notification_option: Option de notification par défaut
+  label_user_mail_option_only_my_events: Seulement pour ce que je surveille
+  label_user_mail_option_only_assigned: Seulement pour ce qui m'est assigné
+  label_user_mail_option_none: Aucune notification
+  field_member_of_group: Groupe de l'assigné
+  field_assigned_to_role: Rôle de l'assigné

From eea456ed84d159289bdc8826439923d365816fa8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 23 Oct 2010 09:48:01 +0000
Subject: [PATCH 20/30] Improved error message when trying to access an
 archived project (#2995).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4285 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application_controller.rb   | 14 ++++++++++++--
 app/models/project.rb                       |  4 ++++
 app/views/common/403.rhtml                  |  2 +-
 config/locales/bg.yml                       |  1 +
 config/locales/bs.yml                       |  1 +
 config/locales/ca.yml                       |  1 +
 config/locales/cs.yml                       |  1 +
 config/locales/da.yml                       |  1 +
 config/locales/de.yml                       |  1 +
 config/locales/el.yml                       |  1 +
 config/locales/en-GB.yml                    |  1 +
 config/locales/en.yml                       |  1 +
 config/locales/es.yml                       |  1 +
 config/locales/eu.yml                       |  1 +
 config/locales/fi.yml                       |  1 +
 config/locales/fr.yml                       |  1 +
 config/locales/gl.yml                       |  1 +
 config/locales/he.yml                       |  1 +
 config/locales/hr.yml                       |  1 +
 config/locales/hu.yml                       |  1 +
 config/locales/id.yml                       |  1 +
 config/locales/it.yml                       |  1 +
 config/locales/ja.yml                       |  1 +
 config/locales/ko.yml                       |  1 +
 config/locales/lt.yml                       |  1 +
 config/locales/lv.yml                       |  1 +
 config/locales/mk.yml                       |  1 +
 config/locales/mn.yml                       |  1 +
 config/locales/nl.yml                       |  1 +
 config/locales/no.yml                       |  1 +
 config/locales/pl.yml                       |  1 +
 config/locales/pt-BR.yml                    |  1 +
 config/locales/pt.yml                       |  1 +
 config/locales/ro.yml                       |  1 +
 config/locales/ru.yml                       |  1 +
 config/locales/sk.yml                       |  1 +
 config/locales/sl.yml                       |  1 +
 config/locales/sr-YU.yml                    |  1 +
 config/locales/sr.yml                       |  1 +
 config/locales/sv.yml                       |  1 +
 config/locales/th.yml                       |  1 +
 config/locales/tr.yml                       |  1 +
 config/locales/uk.yml                       |  1 +
 config/locales/vi.yml                       |  1 +
 config/locales/zh-TW.yml                    |  1 +
 config/locales/zh.yml                       |  1 +
 test/functional/projects_controller_test.rb | 10 ++++++++++
 test/unit/project_test.rb                   |  2 ++
 48 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1299dac3..360d0918 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -154,7 +154,15 @@ class ApplicationController < ActionController::Base
   # Authorize the user for the requested action
   def authorize(ctrl = params[:controller], action = params[:action], global = false)
     allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
-    allowed ? true : deny_access
+    if allowed
+      true
+    else
+      if @project && @project.archived?
+        render_403 :message => :notice_not_authorized_archived_project
+      else
+        deny_access
+      end
+    end
   end
 
   # Authorize the user for the requested action outside a project
@@ -265,8 +273,10 @@ class ApplicationController < ActionController::Base
     redirect_to default
   end
   
-  def render_403
+  def render_403(options={})
     @project = nil
+    @message = options[:message] || :notice_not_authorized
+    @message = l(@message) if @message.is_a?(Symbol)
     respond_to do |format|
       format.html { render :template => "common/403", :layout => use_layout, :status => 403 }
       format.atom { head 403 }
diff --git a/app/models/project.rb b/app/models/project.rb
index 16c97441..a6d7dc79 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -220,6 +220,10 @@ class Project < ActiveRecord::Base
     self.status == STATUS_ACTIVE
   end
   
+  def archived?
+    self.status == STATUS_ARCHIVED
+  end
+  
   # Archives the project and its descendants
   def archive
     # Check that there is no issue of a non descendant project that is assigned
diff --git a/app/views/common/403.rhtml b/app/views/common/403.rhtml
index d1173a18..43f487d1 100644
--- a/app/views/common/403.rhtml
+++ b/app/views/common/403.rhtml
@@ -1,6 +1,6 @@
 <h2>403</h2>
 
-<p><%= l(:notice_not_authorized) %></p>
+<p><%=h @message %></p>
 <p><a href="javascript:history.back()">Back</a></p>
 
 <% html_title '403' %>
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index e6f92cc4..a3f78f81 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -916,3 +916,4 @@ bg:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index f6373516..cebe14da 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -936,3 +936,4 @@ bs:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 842ef621..9befe1d1 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -925,3 +925,4 @@ ca:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index d4449cee..5e90855f 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -922,3 +922,4 @@ cs:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/da.yml b/config/locales/da.yml
index e557721a..87e813bb 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -938,3 +938,4 @@ da:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9c9a853d..f2eb1e84 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -941,3 +941,4 @@ de:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 963f30da..85f4bccb 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -922,3 +922,4 @@ el:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index a6b28170..e14276aa 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -926,3 +926,4 @@ en-GB:
   setting_default_notification_option: Default notification option
   label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
   label_user_mail_option_only_assigned: Only for things I am assigned to
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bdf2e982..083d781b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -150,6 +150,7 @@ en:
   notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
   notice_locking_conflict: Data has been updated by another user.
   notice_not_authorized: You are not authorized to access this page.
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
   notice_email_sent: "An email was sent to {{value}}"
   notice_email_error: "An error occurred while sending mail ({{value}})"
   notice_feeds_access_key_reseted: Your RSS access key was reset.
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 2b08b1dc..8f824d20 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -962,3 +962,4 @@ es:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index b45bf0e7..6072c3b6 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -926,3 +926,4 @@ eu:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index e4f107e9..b1fdae73 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -947,3 +947,4 @@ fi:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 67848932..92720abb 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -169,6 +169,7 @@ fr:
   notice_file_not_found: "La page à laquelle vous souhaitez accéder n'existe pas ou a été supprimée."
   notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible.
   notice_not_authorized: "Vous n'êtes pas autorisés à accéder à cette page."
+  notice_not_authorized_archived_project: Le projet auquel vous tentez d'accéder a été archivé.
   notice_email_sent: "Un email a été envoyé à {{value}}"
   notice_email_error: "Erreur lors de l'envoi de l'email ({{value}})"
   notice_feeds_access_key_reseted: "Votre clé d'accès aux flux RSS a été réinitialisée."
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 14f04ab1..d3ee6def 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -938,3 +938,4 @@ gl:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 1fc167e7..72f5a6cb 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -927,3 +927,4 @@ he:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 725411c9..a9f702e4 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -929,3 +929,4 @@ hr:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 767f2d67..b08e9055 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -945,3 +945,4 @@
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/id.yml b/config/locales/id.yml
index b9136702..e3e120f9 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -930,3 +930,4 @@ id:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index f39dfbb9..2faa28bc 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -926,3 +926,4 @@ it:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 92bfd158..a9adc09e 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -947,3 +947,4 @@ ja:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 7cc8ad62..e74ad2aa 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -978,3 +978,4 @@ ko:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 186c61a3..e091422c 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -986,3 +986,4 @@ lt:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 5c338cd3..c0fd2371 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -917,3 +917,4 @@ lv:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 6dd1fca2..5d7124f7 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -922,3 +922,4 @@ mk:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index a0f4be9e..b6032f95 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -923,3 +923,4 @@ mn:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index ab9fdfad..b1516575 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -904,3 +904,4 @@ nl:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 592af9d6..b21eba1b 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -913,3 +913,4 @@
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index d1193107..25099c98 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -943,3 +943,4 @@ pl:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index f8609304..78448f7a 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -946,3 +946,4 @@ pt-BR:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index eb8917e7..24ee8683 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -930,3 +930,4 @@ pt:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index b1e311ff..7076ef85 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -915,3 +915,4 @@ ro:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ee6c7042..b0ed5cbb 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1039,3 +1039,4 @@ ru:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index e49a2149..c26bca76 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -917,3 +917,4 @@ sk:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 33eade58..417a19a2 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -918,3 +918,4 @@ sl:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 0aee7ec5..53c8e5e6 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -922,3 +922,4 @@ sr-YU:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index b1686eb3..dd492404 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -923,3 +923,4 @@ sr:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 0b19956b..8509a035 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -967,3 +967,4 @@ sv:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/th.yml b/config/locales/th.yml
index d0275afd..7344a928 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -919,3 +919,4 @@ th:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 32ae9cc4..3fd0b744 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -945,3 +945,4 @@ tr:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 28e6caa3..f7556417 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -918,3 +918,4 @@ uk:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 84adc162..b1e1662c 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -977,3 +977,4 @@ vi:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 89ea4886..82db9271 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1008,3 +1008,4 @@
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 3439b312..ba933290 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -940,3 +940,4 @@ zh:
   label_user_mail_option_none: No events
   field_member_of_group: Assignee's group
   field_assigned_to_role: Assignee's role
+  notice_not_authorized_archived_project: The project you're trying to access has been archived.
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 8a9bbe6d..7122f89e 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -296,6 +296,16 @@ class ProjectsControllerTest < ActionController::TestCase
     assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
   end
   
+  def show_archived_project_should_be_denied
+    project = Project.find_by_identifier('ecookbook')
+    project.archive!
+    
+    get :show, :id => 'ecookbook'
+    assert_response 403
+    assert_nil assigns(:project)
+    assert_tag :tag => 'p', :content => /archived/
+  end
+  
   def test_private_subprojects_hidden
     get :show, :id => 'ecookbook'
     assert_response :success
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index 08b0fb24..e4927eba 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -102,6 +102,7 @@ class ProjectTest < ActiveSupport::TestCase
     @ecookbook.reload
     
     assert !@ecookbook.active?
+    assert @ecookbook.archived?
     assert !user.projects.include?(@ecookbook)
     # Subproject are also archived
     assert !@ecookbook.children.empty?
@@ -129,6 +130,7 @@ class ProjectTest < ActiveSupport::TestCase
     assert @ecookbook.unarchive
     @ecookbook.reload
     assert @ecookbook.active?
+    assert !@ecookbook.archived?
     assert user.projects.include?(@ecookbook)
     # Subproject can now be unarchived
     @ecookbook_sub1.reload

From 7824eca77561dea52960b3d094389bd4e85eeccf Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 23 Oct 2010 11:07:04 +0000
Subject: [PATCH 21/30] Refactor: merged error rendering methods.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4286 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application_controller.rb | 42 +++++++++--------------
 app/views/common/403.rhtml                |  6 ----
 app/views/common/404.rhtml                |  6 ----
 app/views/common/error.html.erb           |  6 ++++
 test/functional/issues_controller_test.rb |  8 ++---
 test/test_helper.rb                       |  6 +++-
 6 files changed, 30 insertions(+), 44 deletions(-)
 delete mode 100644 app/views/common/403.rhtml
 delete mode 100644 app/views/common/404.rhtml
 create mode 100644 app/views/common/error.html.erb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 360d0918..d7b1add8 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -275,39 +275,31 @@ class ApplicationController < ActionController::Base
   
   def render_403(options={})
     @project = nil
-    @message = options[:message] || :notice_not_authorized
-    @message = l(@message) if @message.is_a?(Symbol)
-    respond_to do |format|
-      format.html { render :template => "common/403", :layout => use_layout, :status => 403 }
-      format.atom { head 403 }
-      format.xml { head 403 }
-      format.js { head 403 }
-      format.json { head 403 }
-    end
+    render_error({:message => :notice_not_authorized, :status => 403}.merge(options))
     return false
   end
     
-  def render_404
-    respond_to do |format|
-      format.html { render :template => "common/404", :layout => use_layout, :status => 404 }
-      format.atom { head 404 }
-      format.xml { head 404 }
-      format.js { head 404 }
-      format.json { head 404 }
-    end
+  def render_404(options={})
+    render_error({:message => :notice_file_not_found, :status => 404}.merge(options))
     return false
   end
   
-  def render_error(msg)
+  # Renders an error response
+  def render_error(arg)
+    arg = {:message => arg} unless arg.is_a?(Hash)
+    
+    @message = arg[:message]
+    @message = l(@message) if @message.is_a?(Symbol)
+    @status = arg[:status] || 500
+    
     respond_to do |format|
-      format.html { 
-        flash.now[:error] = msg
-        render :text => '', :layout => use_layout, :status => 500
+      format.html {
+        render :template => 'common/error', :layout => use_layout, :status => @status
       }
-      format.atom { head 500 }
-      format.xml { head 500 }
-      format.js { head 500 }
-      format.json { head 500 }
+      format.atom { head @status }
+      format.xml { head @status }
+      format.js { head @status }
+      format.json { head @status }
     end
   end
 
diff --git a/app/views/common/403.rhtml b/app/views/common/403.rhtml
deleted file mode 100644
index 43f487d1..00000000
--- a/app/views/common/403.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<h2>403</h2>
-
-<p><%=h @message %></p>
-<p><a href="javascript:history.back()">Back</a></p>
-
-<% html_title '403' %>
diff --git a/app/views/common/404.rhtml b/app/views/common/404.rhtml
deleted file mode 100644
index 753e716c..00000000
--- a/app/views/common/404.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<h2>404</h2>
-
-<p><%= l(:notice_file_not_found) %></p>
-<p><a href="javascript:history.back()">Back</a></p>
-
-<% html_title '404' %>
diff --git a/app/views/common/error.html.erb b/app/views/common/error.html.erb
new file mode 100644
index 00000000..35d90864
--- /dev/null
+++ b/app/views/common/error.html.erb
@@ -0,0 +1,6 @@
+<h2><%=h @status %></h2>
+
+<p id="errorExplanation"><%=h @message %></p>
+<p><a href="javascript:history.back()">Back</a></p>
+
+<% html_title @status %>
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 59b16c32..48ab8cef 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -340,9 +340,7 @@ class IssuesControllerTest < ActionController::TestCase
     
     get :new, :project_id => 1
     assert_response 500
-    assert_not_nil flash[:error]
-    assert_tag :tag => 'div', :attributes => { :class => /error/ },
-                              :content => /No default issue/
+    assert_error_tag :content => /No default issue/
   end
   
   def test_get_new_with_no_tracker_should_display_an_error
@@ -351,9 +349,7 @@ class IssuesControllerTest < ActionController::TestCase
     
     get :new, :project_id => 1
     assert_response 500
-    assert_not_nil flash[:error]
-    assert_tag :tag => 'div', :attributes => { :class => /error/ },
-                              :content => /No tracker/
+    assert_error_tag :content => /No tracker/
   end
   
   def test_update_new_form
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9a276102..eea1a03b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -113,11 +113,15 @@ class ActiveSupport::TestCase
   def self.repository_configured?(vendor)
     File.directory?(repository_path(vendor))
   end
+  
+  def assert_error_tag(options={})
+    assert_tag({:tag => 'p', :attributes => { :id => 'errorExplanation' }}.merge(options))
+  end
 
   # Shoulda macros
   def self.should_render_404
     should_respond_with :not_found
-    should_render_template 'common/404'
+    should_render_template 'common/error'
   end
 
   def self.should_have_before_filter(expected_method, options = {})

From d642964035e6be4687c37e9e01af4b5590580396 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
Date: Sat, 23 Oct 2010 22:35:02 +0000
Subject: [PATCH 22/30] Fixed: auto links ending with right angle bracket
 shouldn't include the bracket in the URL. #5652

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4287 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/wiki_formatting/textile/formatter.rb | 2 +-
 test/unit/helpers/application_helper_test.rb     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/redmine/wiki_formatting/textile/formatter.rb b/lib/redmine/wiki_formatting/textile/formatter.rb
index a622e803..6794f82c 100644
--- a/lib/redmine/wiki_formatting/textile/formatter.rb
+++ b/lib/redmine/wiki_formatting/textile/formatter.rb
@@ -121,7 +121,7 @@ module Redmine
                           (\S+?)                   # url
                           (\/)?                    # slash
                         )
-                        ([^\w\=\/;\(\)]*?)               # post
+                        ((?:&gt;)?|[^\w\=\/;\(\)]*?)               # post
                         (?=<|\s|$)
                        }x unless const_defined?(:AUTO_LINK_RE)
   
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index d44bc004..83a50859 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -79,6 +79,8 @@ class ApplicationHelperTest < ActionView::TestCase
       'http://example.net/path!602815048C7B5C20!302.html' => '<a class="external" href="http://example.net/path!602815048C7B5C20!302.html">http://example.net/path!602815048C7B5C20!302.html</a>',
       # escaping
       'http://foo"bar' => '<a class="external" href="http://foo&quot;bar">http://foo"bar</a>',
+      # wrap in angle brackets
+      '<http://foo.bar>' => '&lt;<a class="external" href="http://foo.bar">http://foo.bar</a>&gt;'
     }
     to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
   end

From d9f2bccf7092a50ba34f100b9a73d89e5b678bf7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 24 Oct 2010 21:00:05 +0000
Subject: [PATCH 23/30] Adds a user-agent to reposman (#6735).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4288 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/svn/reposman.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extra/svn/reposman.rb b/extra/svn/reposman.rb
index b72ad126..c92e32c5 100755
--- a/extra/svn/reposman.rb
+++ b/extra/svn/reposman.rb
@@ -180,7 +180,9 @@ rescue LoadError
   log("This script requires activeresource.\nRun 'gem install activeresource' to install it.", :exit => true)
 end
 
-class Project < ActiveResource::Base; end
+class Project < ActiveResource::Base
+  self.headers["User-agent"] = "Redmine repository manager/#{Version}"
+end
 
 log("querying Redmine for projects...", :level => 1);
 

From 0e951c071631fee35962b264d3db2c68961bf670 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Mon, 25 Oct 2010 15:42:41 +0000
Subject: [PATCH 24/30] Fix the tests that were broken by r4286:

"Refactor: merged error rendering methods."

http://ci.finn.de/builds/1-8-7_redmine-trunk_mysql/4286

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4289 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/repositories_cvs_controller_test.rb        | 2 +-
 test/functional/repositories_git_controller_test.rb        | 2 +-
 test/functional/repositories_subversion_controller_test.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index f3d4ecfe..fa604dc8 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -106,7 +106,7 @@ class RepositoriesCvsControllerTest < ActionController::TestCase
     
     def test_entry_not_found
       get :entry, :id => 1, :path => ['sources', 'zzz.c']
-      assert_tag :tag => 'div', :attributes => { :class => /error/ },
+      assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                                 :content => /The entry or revision was not found in the repository/
     end
   
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 941fbcf1..326a5303 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -154,7 +154,7 @@ class RepositoriesGitControllerTest < ActionController::TestCase
     def test_annotate_binary_file
       get :annotate, :id => 3, :path => ['images', 'edit.png']
       assert_response 500
-      assert_tag :tag => 'div', :attributes => { :class => /error/ },
+      assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                                 :content => /can not be annotated/
     end
   else
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index 7c88f253..7cc2cbfc 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -129,7 +129,7 @@ class RepositoriesSubversionControllerTest < ActionController::TestCase
     
     def test_entry_not_found
       get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']
-      assert_tag :tag => 'div', :attributes => { :class => /error/ },
+      assert_tag :tag => 'p', :attributes => { :id => /errorExplanation/ },
                                 :content => /The entry or revision was not found in the repository/
     end
   

From 4b045badcfde2eb27b63023ca8f3c30334d7f00f Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Mon, 25 Oct 2010 16:16:46 +0000
Subject: [PATCH 25/30] Refactor: Rename WikiController#page_index to #index

index is the action that should list a collection of records, which is
what #page_index does.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4290 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/wiki_controller.rb            | 25 +++++++++++++++----
 app/views/wiki/_sidebar.rhtml                 |  2 +-
 .../{page_index.html.erb => index.html.erb}   |  0
 config/routes.rb                              |  2 +-
 lib/redmine.rb                                |  2 +-
 test/functional/wiki_controller_test.rb       | 14 +++++------
 test/integration/routing_test.rb              |  2 +-
 7 files changed, 31 insertions(+), 16 deletions(-)
 rename app/views/wiki/{page_index.html.erb => index.html.erb} (100%)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 1c42ab5c..c7b86623 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -17,6 +17,20 @@
 
 require 'diff'
 
+# The WikiController follows the Rails REST controller pattern but with
+# a few differences
+#
+# * index - shows a list of WikiPages grouped by page or date
+# * new - not used
+# * create - not used
+# * show - will also show the form for creating a new wiki page
+# * edit - used to edit an existing or new page
+# * update - used to save a wiki page update to the database, including new pages
+# * destroy - normal
+#
+# Other member and collection methods are also used
+#
+# TODO: still being worked on
 class WikiController < ApplicationController
   default_search_scope :wiki_pages
   before_filter :find_wiki, :authorize
@@ -28,6 +42,11 @@ class WikiController < ApplicationController
   include AttachmentsHelper   
   helper :watchers
 
+  # List of pages, sorted alphabetically and by parent (hierarchy)
+  def index
+    load_pages_grouped_by_date_without_content
+  end
+
   # display a page (in editing mode if it doesn't exist)
   def show
     page_title = params[:page]
@@ -180,7 +199,7 @@ class WikiController < ApplicationController
       end
     end
     @page.destroy
-    redirect_to :action => 'page_index', :project_id => @project
+    redirect_to :action => 'index', :project_id => @project
   end
 
   # Export wiki to a single html file
@@ -194,10 +213,6 @@ class WikiController < ApplicationController
     end
   end
 
-  def page_index
-    load_pages_grouped_by_date_without_content
-  end
-
   def date_index
     load_pages_grouped_by_date_without_content
   end
diff --git a/app/views/wiki/_sidebar.rhtml b/app/views/wiki/_sidebar.rhtml
index efb24af0..7f60825a 100644
--- a/app/views/wiki/_sidebar.rhtml
+++ b/app/views/wiki/_sidebar.rhtml
@@ -5,5 +5,5 @@
 <h3><%= l(:label_wiki) %></h3>
 
 <%= link_to l(:field_start_page), {:action => 'show', :page => nil} %><br />
-<%= link_to l(:label_index_by_title), {:action => 'page_index'} %><br />
+<%= link_to l(:label_index_by_title), {:action => 'index'} %><br />
 <%= link_to l(:label_index_by_date), {:action => 'date_index'} %><br />
diff --git a/app/views/wiki/page_index.html.erb b/app/views/wiki/index.html.erb
similarity index 100%
rename from app/views/wiki/page_index.html.erb
rename to app/views/wiki/index.html.erb
diff --git a/config/routes.rb b/config/routes.rb
index 511e6dc2..5ca9d86d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -30,7 +30,7 @@ ActionController::Routing::Routes.draw do |map|
   map.with_options :controller => 'wiki' do |wiki_routes|
     wiki_routes.with_options :conditions => {:method => :get} do |wiki_views|
       wiki_views.connect 'projects/:project_id/wiki/export', :action => 'export'
-      wiki_views.connect 'projects/:project_id/wiki/page_index', :action => 'page_index'
+      wiki_views.connect 'projects/:project_id/wiki/index', :action => 'index'
       wiki_views.connect 'projects/:project_id/wiki/date_index', :action => 'date_index'
       wiki_views.connect 'projects/:project_id/wiki/:page', :action => 'show', :page => nil
       wiki_views.connect 'projects/:project_id/wiki/:page/edit', :action => 'edit'
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 1a4b581c..e813950c 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -111,7 +111,7 @@ Redmine::AccessControl.map 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 => [:show, :special, :page_index, :date_index]
+    map.permission :view_wiki_pages, :wiki => [:index, :show, :special, :date_index]
     map.permission :export_wiki_pages, :wiki => [:export]
     map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
     map.permission :edit_wiki_pages, :wiki => [:edit, :update, :preview, :add_attachment]
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 61e26592..fecde615 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -197,7 +197,7 @@ class WikiControllerTest < ActionController::TestCase
   def test_destroy_child
     @request.session[:user_id] = 2
     post :destroy, :project_id => 1, :page => 'Child_1'
-    assert_redirected_to :action => 'page_index', :project_id => 'ecookbook'
+    assert_redirected_to :action => 'index', :project_id => 'ecookbook'
   end
   
   def test_destroy_parent
@@ -214,7 +214,7 @@ class WikiControllerTest < ActionController::TestCase
     assert_difference('WikiPage.count', -1) do
       post :destroy, :project_id => 1, :page => 'Another_page', :todo => 'nullify'
     end
-    assert_redirected_to :action => 'page_index', :project_id => 'ecookbook'
+    assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     assert_nil WikiPage.find_by_id(2)
   end
   
@@ -223,7 +223,7 @@ class WikiControllerTest < ActionController::TestCase
     assert_difference('WikiPage.count', -3) do
       post :destroy, :project_id => 1, :page => 'Another_page', :todo => 'destroy'
     end
-    assert_redirected_to :action => 'page_index', :project_id => 'ecookbook'
+    assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     assert_nil WikiPage.find_by_id(2)
     assert_nil WikiPage.find_by_id(5)
   end
@@ -233,15 +233,15 @@ class WikiControllerTest < ActionController::TestCase
     assert_difference('WikiPage.count', -1) do
       post :destroy, :project_id => 1, :page => 'Another_page', :todo => 'reassign', :reassign_to_id => 1
     end
-    assert_redirected_to :action => 'page_index', :project_id => 'ecookbook'
+    assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     assert_nil WikiPage.find_by_id(2)
     assert_equal WikiPage.find(1), WikiPage.find_by_id(5).parent
   end
   
-  def test_page_index
-    get :page_index, :project_id => 'ecookbook'
+  def test_index
+    get :index, :project_id => 'ecookbook'
     assert_response :success
-    assert_template 'page_index'
+    assert_template 'index'
     pages = assigns(:pages)
     assert_not_nil pages
     assert_equal Project.find(1).wiki.pages.size, pages.size
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index ea8c71b0..c749f51e 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -318,7 +318,7 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :get, "/projects/1/wiki/CookBook_documentation/diff/2/vs/1", :controller => 'wiki', :action => 'diff', :project_id => '1', :page => 'CookBook_documentation', :version => '2', :version_from => '1'
     should_route :get, "/projects/1/wiki/CookBook_documentation/annotate/2", :controller => 'wiki', :action => 'annotate', :project_id => '1', :page => 'CookBook_documentation', :version => '2'
     should_route :get, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :page => 'ladida'
-    should_route :get, "/projects/567/wiki/page_index", :controller => 'wiki', :action => 'page_index', :project_id => '567'
+    should_route :get, "/projects/567/wiki/index", :controller => 'wiki', :action => 'index', :project_id => '567'
     should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'date_index', :project_id => '567'
     should_route :get, "/projects/567/wiki/export", :controller => 'wiki', :action => 'export', :project_id => '567'
     

From 22e3cba0b712150d7286ff9e641b0c05e028191a Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Mon, 25 Oct 2010 18:44:41 +0000
Subject: [PATCH 26/30] Allow changing the Priority when moving issues.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4291 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issue_moves_controller.rb      |  2 +-
 app/views/issue_moves/new.rhtml                |  5 +++++
 test/functional/issue_moves_controller_test.rb | 13 +++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/controllers/issue_moves_controller.rb b/app/controllers/issue_moves_controller.rb
index 20da3875..028d4d6d 100644
--- a/app/controllers/issue_moves_controller.rb
+++ b/app/controllers/issue_moves_controller.rb
@@ -54,7 +54,7 @@ class IssueMovesController < ApplicationController
 
   def extract_changed_attributes_for_move(params)
     changed_attributes = {}
-    [:assigned_to_id, :status_id, :start_date, :due_date].each do |valid_attribute|
+    [:assigned_to_id, :status_id, :start_date, :due_date, :priority_id].each do |valid_attribute|
       unless params[valid_attribute].blank?
         changed_attributes[valid_attribute] = (params[valid_attribute] == 'none' ? nil : params[valid_attribute])
       end
diff --git a/app/views/issue_moves/new.rhtml b/app/views/issue_moves/new.rhtml
index 2dc971df..946ddab9 100644
--- a/app/views/issue_moves/new.rhtml
+++ b/app/views/issue_moves/new.rhtml
@@ -33,6 +33,11 @@
   <%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %>
 </p>
 
+<p>
+  <label><%= l(:field_priority) %></label>
+  <%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
+</p>
+
 <p>
   <label><%= l(:field_start_date) %></label>
   <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %>
diff --git a/test/functional/issue_moves_controller_test.rb b/test/functional/issue_moves_controller_test.rb
index 7c400576..62593ac3 100644
--- a/test/functional/issue_moves_controller_test.rb
+++ b/test/functional/issue_moves_controller_test.rb
@@ -40,6 +40,19 @@ class IssueMovesControllerTest < ActionController::TestCase
     assert_equal 2, Issue.find(2).tracker_id
   end
 
+  context "#create via bulk move" do
+    should "allow changing the issue priority" do
+      @request.session[:user_id] = 2
+      post :create, :ids => [1, 2], :priority_id => 6
+
+      assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
+      assert_equal 6, Issue.find(1).priority_id
+      assert_equal 6, Issue.find(2).priority_id
+
+    end
+    
+  end
+
   def test_bulk_copy_to_another_project
     @request.session[:user_id] = 2
     assert_difference 'Issue.count', 2 do

From 397222f1984b7d00a88b718d4a97ce40ccabbedd Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Mon, 25 Oct 2010 18:44:46 +0000
Subject: [PATCH 27/30] Allow adding notes when moving issues

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4292 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issue_moves_controller.rb      |  3 +++
 app/views/issue_moves/new.rhtml                |  5 +++++
 test/functional/issue_moves_controller_test.rb | 14 +++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/controllers/issue_moves_controller.rb b/app/controllers/issue_moves_controller.rb
index 028d4d6d..34123089 100644
--- a/app/controllers/issue_moves_controller.rb
+++ b/app/controllers/issue_moves_controller.rb
@@ -18,6 +18,7 @@ class IssueMovesController < ApplicationController
       @issues.each do |issue|
         issue.reload
         issue.init_journal(User.current)
+        issue.current_journal.notes = @notes if @notes.present?
         call_hook(:controller_issues_move_before_save, { :params => params, :issue => issue, :target_project => @target_project, :copy => !!@copy })
         if r = issue.move_to_project(@target_project, new_tracker, {:copy => @copy, :attributes => extract_changed_attributes_for_move(params)})
           moved_issues << r
@@ -50,6 +51,8 @@ class IssueMovesController < ApplicationController
     @target_project ||= @project    
     @trackers = @target_project.trackers
     @available_statuses = Workflow.available_statuses(@project)
+    @notes = params[:notes]
+    @notes ||= ''
   end
 
   def extract_changed_attributes_for_move(params)
diff --git a/app/views/issue_moves/new.rhtml b/app/views/issue_moves/new.rhtml
index 946ddab9..c51399eb 100644
--- a/app/views/issue_moves/new.rhtml
+++ b/app/views/issue_moves/new.rhtml
@@ -48,6 +48,11 @@
   <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>
 </p>
 
+<fieldset><legend><%= l(:field_notes) %></legend>
+<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
+<%= wikitoolbar_for 'notes' %>
+</fieldset>
+
 <%= call_hook(:view_issues_move_bottom, :issues => @issues, :target_project => @target_project, :copy => !!@copy) %>
 </div>
 
diff --git a/test/functional/issue_moves_controller_test.rb b/test/functional/issue_moves_controller_test.rb
index 62593ac3..dc19ddc8 100644
--- a/test/functional/issue_moves_controller_test.rb
+++ b/test/functional/issue_moves_controller_test.rb
@@ -41,8 +41,11 @@ class IssueMovesControllerTest < ActionController::TestCase
   end
 
   context "#create via bulk move" do
-    should "allow changing the issue priority" do
+    setup do
       @request.session[:user_id] = 2
+    end
+    
+    should "allow changing the issue priority" do
       post :create, :ids => [1, 2], :priority_id => 6
 
       assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
@@ -50,6 +53,15 @@ class IssueMovesControllerTest < ActionController::TestCase
       assert_equal 6, Issue.find(2).priority_id
 
     end
+
+    should "allow adding a note when moving" do
+      post :create, :ids => [1, 2], :notes => 'Moving two issues'
+
+      assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
+      assert_equal 'Moving two issues', Issue.find(1).journals.last.notes
+      assert_equal 'Moving two issues', Issue.find(2).journals.last.notes
+
+    end
     
   end
 

From c399e7632478fbd4ab94a52d68f4b6198142be35 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Mon, 25 Oct 2010 23:32:01 +0000
Subject: [PATCH 28/30] Add Redmine::Plugin.installed?(:name) method to check
 if a plugin is installed

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4293 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/plugin.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb
index 11255e02..f30277ad 100644
--- a/lib/redmine/plugin.rb
+++ b/lib/redmine/plugin.rb
@@ -89,6 +89,13 @@ module Redmine #:nodoc:
     def self.clear
       @registered_plugins = {}
     end
+
+    # Checks if a plugin is installed
+    #
+    # @param [String] id name of the plugin
+    def self.installed?(id)
+      registered_plugins[id.to_sym].present?
+    end
     
     def initialize(id)
       @id = id.to_sym

From 17eab0f5f9ecec337380f3cf8232da2aa32a5d99 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Tue, 26 Oct 2010 15:44:30 +0000
Subject: [PATCH 29/30] Fix wiki links on the activity page. #6746

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4294 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/wiki_content.rb | 2 +-
 app/models/wiki_page.rb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
index 1f0eb9a6..68de4665 100644
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -54,7 +54,7 @@ class WikiContent < ActiveRecord::Base
                   :description => :comments,
                   :datetime => :updated_on,
                   :type => 'wiki-page',
-                  :url => Proc.new {|o| {:controller => 'wiki', :id => o.page.wiki.project_id, :page => o.page.title, :version => o.version}}
+                  :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.page.wiki.project, :page => o.page.title, :version => o.version}}
 
     acts_as_activity_provider :type => 'wiki_edits',
                               :timestamp => "#{WikiContent.versioned_table_name}.updated_on",
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 010a8532..d489ec01 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -28,7 +28,7 @@ class WikiPage < ActiveRecord::Base
   acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
                 :description => :text,
                 :datetime => :created_on,
-                :url => Proc.new {|o| {:controller => 'wiki', :id => o.wiki.project, :page => o.title}}
+                :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :page => o.title}}
 
   acts_as_searchable :columns => ['title', 'text'],
                      :include => [{:wiki => :project}, :content],

From 70bf0706b2f7933f72cbd4daab8e43b0ac9de4e9 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Tue, 26 Oct 2010 15:59:20 +0000
Subject: [PATCH 30/30] Refactor: convert WikiController#destroy to use HTTP
 DELETE

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4295 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/wiki_controller.rb      |  5 +++--
 app/views/wiki/destroy.rhtml            |  2 +-
 app/views/wiki/show.rhtml               |  2 +-
 config/routes.rb                        |  4 +++-
 test/functional/wiki_controller_test.rb | 10 +++++-----
 test/integration/routing_test.rb        |  3 ++-
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index c7b86623..4f15d35a 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -36,7 +36,7 @@ class WikiController < ApplicationController
   before_filter :find_wiki, :authorize
   before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]
   
-  verify :method => :post, :only => [:destroy, :protect], :redirect_to => { :action => :show }
+  verify :method => :post, :only => [:protect], :redirect_to => { :action => :show }
 
   helper :attachments
   include AttachmentsHelper   
@@ -172,7 +172,8 @@ class WikiController < ApplicationController
     @annotate = @page.annotate(params[:version])
     render_404 unless @annotate
   end
-  
+
+  verify :method => :delete, :only => [:destroy], :redirect_to => { :action => :show }
   # Removes a wiki page and its history
   # Children can be either set as root pages, removed or reassigned to another parent page
   def destroy
diff --git a/app/views/wiki/destroy.rhtml b/app/views/wiki/destroy.rhtml
index 83c81fd5..99f47032 100644
--- a/app/views/wiki/destroy.rhtml
+++ b/app/views/wiki/destroy.rhtml
@@ -1,6 +1,6 @@
 <h2><%=h @page.pretty_title %></h2>
 
-<% form_tag({}) do %>
+<% form_tag({}, :method => :delete) do %>
 <div class="box">
 <p><strong><%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %></strong></p>
 <p><label><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_wiki_page_nullify_children) %></label><br />
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index f8675608..d8bc8c55 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -5,7 +5,7 @@
 <%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :page => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
 <%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :page => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
 <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :page => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
-<%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :page => @page.title}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
+<%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :page => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
 <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :page => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
 <% end %>
 <%= link_to_if_authorized(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
diff --git a/config/routes.rb b/config/routes.rb
index 5ca9d86d..63c7dd76 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -41,10 +41,12 @@ ActionController::Routing::Routes.draw do |map|
     end
     
     wiki_routes.connect 'projects/:project_id/wiki/:page/:action', 
-      :action => /rename|destroy|preview|protect|add_attachment/,
+      :action => /rename|preview|protect|add_attachment/,
       :conditions => {:method => :post}
 
     wiki_routes.connect 'projects/:project_id/wiki/:page/edit', :action => 'update', :conditions => {:method => :post}
+
+    wiki_routes.connect 'projects/:project_id/wiki/:page', :action => 'destroy', :conditions => {:method => :delete}
   end
   
   map.with_options :controller => 'messages' do |messages_routes|
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index fecde615..9124dad3 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -196,14 +196,14 @@ class WikiControllerTest < ActionController::TestCase
   
   def test_destroy_child
     @request.session[:user_id] = 2
-    post :destroy, :project_id => 1, :page => 'Child_1'
+    delete :destroy, :project_id => 1, :page => 'Child_1'
     assert_redirected_to :action => 'index', :project_id => 'ecookbook'
   end
   
   def test_destroy_parent
     @request.session[:user_id] = 2
     assert_no_difference('WikiPage.count') do
-      post :destroy, :project_id => 1, :page => 'Another_page'
+      delete :destroy, :project_id => 1, :page => 'Another_page'
     end
     assert_response :success
     assert_template 'destroy'
@@ -212,7 +212,7 @@ class WikiControllerTest < ActionController::TestCase
   def test_destroy_parent_with_nullify
     @request.session[:user_id] = 2
     assert_difference('WikiPage.count', -1) do
-      post :destroy, :project_id => 1, :page => 'Another_page', :todo => 'nullify'
+      delete :destroy, :project_id => 1, :page => 'Another_page', :todo => 'nullify'
     end
     assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     assert_nil WikiPage.find_by_id(2)
@@ -221,7 +221,7 @@ class WikiControllerTest < ActionController::TestCase
   def test_destroy_parent_with_cascade
     @request.session[:user_id] = 2
     assert_difference('WikiPage.count', -3) do
-      post :destroy, :project_id => 1, :page => 'Another_page', :todo => 'destroy'
+      delete :destroy, :project_id => 1, :page => 'Another_page', :todo => 'destroy'
     end
     assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     assert_nil WikiPage.find_by_id(2)
@@ -231,7 +231,7 @@ class WikiControllerTest < ActionController::TestCase
   def test_destroy_parent_with_reassign
     @request.session[:user_id] = 2
     assert_difference('WikiPage.count', -1) do
-      post :destroy, :project_id => 1, :page => 'Another_page', :todo => 'reassign', :reassign_to_id => 1
+      delete :destroy, :project_id => 1, :page => 'Another_page', :todo => 'reassign', :reassign_to_id => 1
     end
     assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     assert_nil WikiPage.find_by_id(2)
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index c749f51e..e41a04bd 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -325,9 +325,10 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'update', :project_id => '567', :page => 'my_page'
     should_route :post, "/projects/567/wiki/CookBook_documentation/preview", :controller => 'wiki', :action => 'preview', :project_id => '567', :page => 'CookBook_documentation'
     should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :page => 'ladida'
-    should_route :post, "/projects/22/wiki/ladida/destroy", :controller => 'wiki', :action => 'destroy', :project_id => '22', :page => 'ladida'
     should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :project_id => '22', :page => 'ladida'
     should_route :post, "/projects/22/wiki/ladida/add_attachment", :controller => 'wiki', :action => 'add_attachment', :project_id => '22', :page => 'ladida'
+
+    should_route :delete, "/projects/22/wiki/ladida", :controller => 'wiki', :action => 'destroy', :project_id => '22', :page => 'ladida'
   end
 
   context "wikis (plural, admin setup)" do