summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-01-28 21:20:39 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-01-28 21:20:39 +0000
commitc4af6efd2556e045486f6393808ada4835cf2b9e (patch)
treea4a2892550565b528b8d7f84bcf0cb3f5ce8aef4
parentd1d1c9bfd008fc23f64935376417d90b8477e407 (diff)
downloadredmine-c4af6efd2556e045486f6393808ada4835cf2b9e.tar.gz
redmine-c4af6efd2556e045486f6393808ada4835cf2b9e.zip
Fixing calendar and gantt links broken by r2317.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2328 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/issues/calendar.rhtml12
-rw-r--r--config/routes.rb2
2 files changed, 8 insertions, 6 deletions
diff --git a/app/views/issues/calendar.rhtml b/app/views/issues/calendar.rhtml
index 2c845c71d..089482927 100644
--- a/app/views/issues/calendar.rhtml
+++ b/app/views/issues/calendar.rhtml
@@ -16,24 +16,24 @@
<p style="float:right; margin:0px;">
<%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
- {:update => "content", :url => { :project_id => @project, :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
- {:href => url_for(:action => 'calendar', :project_id => @project, :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
+ {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
+ {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
%> |
<%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'),
- {:update => "content", :url => { :project_id => @project, :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
- {:href => url_for(:action => 'calendar', :project_id => @project, :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
+ {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
+ {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
%>
</p>
<p class="buttons">
<%= link_to_remote l(:button_apply),
- { :url => { :project_id => @project, :set_filter => (@query.new_record? ? 1 : nil) },
+ { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
:update => "content",
:with => "Form.serialize('query_form')"
}, :class => 'icon icon-checked' %>
<%= link_to_remote l(:button_clear),
- { :url => { :project_id => @project, :set_filter => (@query.new_record? ? 1 : nil) },
+ { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
:update => "content",
}, :class => 'icon icon-reload' if @query.new_record? %>
</p>
diff --git a/config/routes.rb b/config/routes.rb
index e426d7daf..594fc3164 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -113,6 +113,8 @@ ActionController::Routing::Routes.draw do |map|
issues_views.connect 'issues.:format', :action => 'index'
issues_views.connect 'projects/:project_id/issues.:format', :action => 'index'
issues_views.connect 'projects/:project_id/issues/new', :action => 'new'
+ issues_views.connect 'projects/:project_id/issues/gantt', :action => 'gantt'
+ issues_views.connect 'projects/:project_id/issues/calendar', :action => 'calendar'
issues_views.connect 'projects/:project_id/issues/:copy_from/copy', :action => 'new'
issues_views.connect 'issues/:id', :action => 'show', :id => /\d+/
issues_views.connect 'issues/:id.:format', :action => 'show', :id => /\d+/