##// END OF EJS Templates
Refactor: convert timelogs to a REST resource (:time_entries)...
Eric Davis -
r4136:718816c5d4b0
parent child
Show More
@@ -1,221 +1,220
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class TimelogController < ApplicationController
19 19 menu_item :issues
20 20 before_filter :find_project, :authorize, :only => [:new, :create, :edit, :update, :destroy]
21 21 before_filter :find_optional_project, :only => [:index]
22 22
23 verify :method => :post, :only => :destroy, :redirect_to => { :action => :index }
24
25 23 helper :sort
26 24 include SortHelper
27 25 helper :issues
28 26 include TimelogHelper
29 27 helper :custom_fields
30 28 include CustomFieldsHelper
31 29
32 30 def index
33 31 sort_init 'spent_on', 'desc'
34 32 sort_update 'spent_on' => 'spent_on',
35 33 'user' => 'user_id',
36 34 'activity' => 'activity_id',
37 35 'project' => "#{Project.table_name}.name",
38 36 'issue' => 'issue_id',
39 37 'hours' => 'hours'
40 38
41 39 cond = ARCondition.new
42 40 if @project.nil?
43 41 cond << Project.allowed_to_condition(User.current, :view_time_entries)
44 42 elsif @issue.nil?
45 43 cond << @project.project_condition(Setting.display_subprojects_issues?)
46 44 else
47 45 cond << "#{Issue.table_name}.root_id = #{@issue.root_id} AND #{Issue.table_name}.lft >= #{@issue.lft} AND #{Issue.table_name}.rgt <= #{@issue.rgt}"
48 46 end
49 47
50 48 retrieve_date_range
51 49 cond << ['spent_on BETWEEN ? AND ?', @from, @to]
52 50
53 51 TimeEntry.visible_by(User.current) do
54 52 respond_to do |format|
55 53 format.html {
56 54 # Paginate results
57 55 @entry_count = TimeEntry.count(:include => [:project, :issue], :conditions => cond.conditions)
58 56 @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
59 57 @entries = TimeEntry.find(:all,
60 58 :include => [:project, :activity, :user, {:issue => :tracker}],
61 59 :conditions => cond.conditions,
62 60 :order => sort_clause,
63 61 :limit => @entry_pages.items_per_page,
64 62 :offset => @entry_pages.current.offset)
65 63 @total_hours = TimeEntry.sum(:hours, :include => [:project, :issue], :conditions => cond.conditions).to_f
66 64
67 65 render :layout => !request.xhr?
68 66 }
69 67 format.atom {
70 68 entries = TimeEntry.find(:all,
71 69 :include => [:project, :activity, :user, {:issue => :tracker}],
72 70 :conditions => cond.conditions,
73 71 :order => "#{TimeEntry.table_name}.created_on DESC",
74 72 :limit => Setting.feeds_limit.to_i)
75 73 render_feed(entries, :title => l(:label_spent_time))
76 74 }
77 75 format.csv {
78 76 # Export all entries
79 77 @entries = TimeEntry.find(:all,
80 78 :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
81 79 :conditions => cond.conditions,
82 80 :order => sort_clause)
83 81 send_data(entries_to_csv(@entries), :type => 'text/csv; header=present', :filename => 'timelog.csv')
84 82 }
85 83 end
86 84 end
87 85 end
88 86
89 87 def new
90 88 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
91 89 @time_entry.attributes = params[:time_entry]
92 90
93 91 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
94 92 render :action => 'edit'
95 93 end
96 94
97 95 verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
98 96 def create
99 97 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
100 98 @time_entry.attributes = params[:time_entry]
101 99
102 100 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
103 101
104 102 if @time_entry.save
105 103 flash[:notice] = l(:notice_successful_update)
106 104 redirect_back_or_default :action => 'index', :project_id => @time_entry.project
107 105 else
108 106 render :action => 'edit'
109 107 end
110 108 end
111 109
112 110 def edit
113 111 (render_403; return) if @time_entry && !@time_entry.editable_by?(User.current)
114 112 @time_entry.attributes = params[:time_entry]
115 113
116 114 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
117 115 end
118 116
119 117 verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
120 118 def update
121 119 (render_403; return) if @time_entry && !@time_entry.editable_by?(User.current)
122 120 @time_entry.attributes = params[:time_entry]
123 121
124 122 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
125 123
126 124 if @time_entry.save
127 125 flash[:notice] = l(:notice_successful_update)
128 126 redirect_back_or_default :action => 'index', :project_id => @time_entry.project
129 127 else
130 128 render :action => 'edit'
131 129 end
132 130 end
133 131
132 verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed }
134 133 def destroy
135 134 (render_404; return) unless @time_entry
136 135 (render_403; return) unless @time_entry.editable_by?(User.current)
137 136 if @time_entry.destroy && @time_entry.destroyed?
138 137 flash[:notice] = l(:notice_successful_delete)
139 138 else
140 139 flash[:error] = l(:notice_unable_delete_time_entry)
141 140 end
142 141 redirect_to :back
143 142 rescue ::ActionController::RedirectBackError
144 143 redirect_to :action => 'index', :project_id => @time_entry.project
145 144 end
146 145
147 146 private
148 147 def find_project
149 148 if params[:id]
150 149 @time_entry = TimeEntry.find(params[:id])
151 150 @project = @time_entry.project
152 151 elsif params[:issue_id]
153 152 @issue = Issue.find(params[:issue_id])
154 153 @project = @issue.project
155 154 elsif params[:project_id]
156 155 @project = Project.find(params[:project_id])
157 156 else
158 157 render_404
159 158 return false
160 159 end
161 160 rescue ActiveRecord::RecordNotFound
162 161 render_404
163 162 end
164 163
165 164 def find_optional_project
166 165 if !params[:issue_id].blank?
167 166 @issue = Issue.find(params[:issue_id])
168 167 @project = @issue.project
169 168 elsif !params[:project_id].blank?
170 169 @project = Project.find(params[:project_id])
171 170 end
172 171 deny_access unless User.current.allowed_to?(:view_time_entries, @project, :global => true)
173 172 end
174 173
175 174 # Retrieves the date range based on predefined ranges or specific from/to param dates
176 175 def retrieve_date_range
177 176 @free_period = false
178 177 @from, @to = nil, nil
179 178
180 179 if params[:period_type] == '1' || (params[:period_type].nil? && !params[:period].nil?)
181 180 case params[:period].to_s
182 181 when 'today'
183 182 @from = @to = Date.today
184 183 when 'yesterday'
185 184 @from = @to = Date.today - 1
186 185 when 'current_week'
187 186 @from = Date.today - (Date.today.cwday - 1)%7
188 187 @to = @from + 6
189 188 when 'last_week'
190 189 @from = Date.today - 7 - (Date.today.cwday - 1)%7
191 190 @to = @from + 6
192 191 when '7_days'
193 192 @from = Date.today - 7
194 193 @to = Date.today
195 194 when 'current_month'
196 195 @from = Date.civil(Date.today.year, Date.today.month, 1)
197 196 @to = (@from >> 1) - 1
198 197 when 'last_month'
199 198 @from = Date.civil(Date.today.year, Date.today.month, 1) << 1
200 199 @to = (@from >> 1) - 1
201 200 when '30_days'
202 201 @from = Date.today - 30
203 202 @to = Date.today
204 203 when 'current_year'
205 204 @from = Date.civil(Date.today.year, 1, 1)
206 205 @to = Date.civil(Date.today.year, 12, 31)
207 206 end
208 207 elsif params[:period_type] == '2' || (params[:period_type].nil? && (!params[:from].nil? || !params[:to].nil?))
209 208 begin; @from = params[:from].to_s.to_date unless params[:from].blank?; rescue; end
210 209 begin; @to = params[:to].to_s.to_date unless params[:to].blank?; rescue; end
211 210 @free_period = true
212 211 else
213 212 # default
214 213 end
215 214
216 215 @from, @to = @to, @from if @from && @to && @from > @to
217 216 @from ||= (TimeEntry.earilest_date_for_project(@project) || Date.today)
218 217 @to ||= (TimeEntry.latest_date_for_project(@project) || Date.today)
219 218 end
220 219
221 220 end
@@ -1,41 +1,41
1 1 <table class="list time-entries">
2 2 <thead>
3 3 <tr>
4 4 <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
5 5 <%= sort_header_tag('user', :caption => l(:label_member)) %>
6 6 <%= sort_header_tag('activity', :caption => l(:label_activity)) %>
7 7 <%= sort_header_tag('project', :caption => l(:label_project)) %>
8 8 <%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %>
9 9 <th><%= l(:field_comments) %></th>
10 10 <%= sort_header_tag('hours', :caption => l(:field_hours)) %>
11 11 <th></th>
12 12 </tr>
13 13 </thead>
14 14 <tbody>
15 15 <% entries.each do |entry| -%>
16 16 <tr class="time-entry <%= cycle("odd", "even") %>">
17 17 <td class="spent_on"><%= format_date(entry.spent_on) %></td>
18 18 <td class="user"><%=h entry.user %></td>
19 19 <td class="activity"><%=h entry.activity %></td>
20 20 <td class="project"><%=h entry.project %></td>
21 21 <td class="subject">
22 22 <% if entry.issue -%>
23 23 <%= entry.issue.visible? ? link_to_issue(entry.issue, :truncate => 50) : "##{entry.issue.id}" -%>
24 24 <% end -%>
25 25 </td>
26 26 <td class="comments"><%=h entry.comments %></td>
27 27 <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
28 28 <td align="center">
29 29 <% if entry.editable_by?(User.current) -%>
30 30 <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil},
31 31 :title => l(:button_edit) %>
32 32 <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil},
33 33 :confirm => l(:text_are_you_sure),
34 :method => :post,
34 :method => :delete,
35 35 :title => l(:button_delete) %>
36 36 <% end -%>
37 37 </td>
38 38 </tr>
39 39 <% end -%>
40 40 </tbody>
41 41 </table>
@@ -1,260 +1,246
1 1 ActionController::Routing::Routes.draw do |map|
2 2 # Add your own custom routes here.
3 3 # The priority is based upon order of creation: first created -> highest priority.
4 4
5 5 # Here's a sample route:
6 6 # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
7 7 # Keep in mind you can assign values other than :controller and :action
8 8
9 9 map.home '', :controller => 'welcome'
10 10
11 11 map.signin 'login', :controller => 'account', :action => 'login'
12 12 map.signout 'logout', :controller => 'account', :action => 'logout'
13 13
14 14 map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
15 15 map.connect 'help/:ctrl/:page', :controller => 'help'
16
17 map.connect 'time_entries/:id/edit', :action => 'edit', :controller => 'timelog'
18 map.connect 'time_entries/:id', :action => 'update', :controller => 'timelog', :conditions => {:method => :put}
19 map.connect 'projects/:project_id/time_entries/new', :action => 'new', :controller => 'timelog'
20 map.connect 'projects/:project_id/issues/:issue_id/time_entries/new', :action => 'new', :controller => 'timelog'
21
22 map.with_options :controller => 'timelog' do |timelog|
23 timelog.connect 'projects/:project_id/time_entries', :action => 'index'
24
25 timelog.with_options :action => 'index', :conditions => {:method => :get} do |time_details|
26 time_details.connect 'time_entries'
27 time_details.connect 'time_entries.:format'
28 time_details.connect 'issues/:issue_id/time_entries'
29 time_details.connect 'issues/:issue_id/time_entries.:format'
30 time_details.connect 'projects/:project_id/time_entries.:format'
31 time_details.connect 'projects/:project_id/issues/:issue_id/time_entries'
32 time_details.connect 'projects/:project_id/issues/:issue_id/time_entries.:format'
33 end
34 timelog.connect 'projects/:project_id/time_entries/report', :controller => 'time_entry_reports', :action => 'report'
35 timelog.with_options :controller => 'time_entry_reports', :action => 'report',:conditions => {:method => :get} do |time_report|
36 time_report.connect 'time_entries/report'
37 time_report.connect 'time_entries/report.:format'
38 time_report.connect 'projects/:project_id/time_entries/report.:format'
39 end
40
41 timelog.with_options :action => 'new', :conditions => {:method => :get} do |time_edit|
42 time_edit.connect 'issues/:issue_id/time_entries/new'
43 end
44 16
45 timelog.connect 'projects/:project_id/timelog/edit', :action => 'create', :conditions => {:method => :post}
46 timelog.connect 'time_entries/:id/destroy', :action => 'destroy', :conditions => {:method => :post}
17 map.connect 'projects/:project_id/time_entries/report', :controller => 'time_entry_reports', :action => 'report'
18 map.with_options :controller => 'time_entry_reports', :action => 'report',:conditions => {:method => :get} do |time_report|
19 time_report.connect 'time_entries/report'
20 time_report.connect 'time_entries/report.:format'
21 time_report.connect 'projects/:project_id/time_entries/report.:format'
47 22 end
23
24 # TODO: wasteful since this is also nested under issues, projects, and projects/issues
25 map.resources :time_entries, :controller => 'timelog'
48 26
49 27 map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post}
50 28 map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get}
51 29 map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post}
52 30 map.with_options :controller => 'wiki' do |wiki_routes|
53 31 wiki_routes.with_options :conditions => {:method => :get} do |wiki_views|
54 32 wiki_views.connect 'projects/:id/wiki/:page', :action => 'special', :page => /page_index|date_index|export/i
55 33 wiki_views.connect 'projects/:id/wiki/:page', :action => 'index', :page => nil
56 34 wiki_views.connect 'projects/:id/wiki/:page/edit', :action => 'edit'
57 35 wiki_views.connect 'projects/:id/wiki/:page/rename', :action => 'rename'
58 36 wiki_views.connect 'projects/:id/wiki/:page/history', :action => 'history'
59 37 wiki_views.connect 'projects/:id/wiki/:page/diff/:version/vs/:version_from', :action => 'diff'
60 38 wiki_views.connect 'projects/:id/wiki/:page/annotate/:version', :action => 'annotate'
61 39 end
62 40
63 41 wiki_routes.connect 'projects/:id/wiki/:page/:action',
64 42 :action => /edit|rename|destroy|preview|protect/,
65 43 :conditions => {:method => :post}
66 44 end
67 45
68 46 map.with_options :controller => 'messages' do |messages_routes|
69 47 messages_routes.with_options :conditions => {:method => :get} do |messages_views|
70 48 messages_views.connect 'boards/:board_id/topics/new', :action => 'new'
71 49 messages_views.connect 'boards/:board_id/topics/:id', :action => 'show'
72 50 messages_views.connect 'boards/:board_id/topics/:id/edit', :action => 'edit'
73 51 end
74 52 messages_routes.with_options :conditions => {:method => :post} do |messages_actions|
75 53 messages_actions.connect 'boards/:board_id/topics/new', :action => 'new'
76 54 messages_actions.connect 'boards/:board_id/topics/:id/replies', :action => 'reply'
77 55 messages_actions.connect 'boards/:board_id/topics/:id/:action', :action => /edit|destroy/
78 56 end
79 57 end
80 58
81 59 map.with_options :controller => 'boards' do |board_routes|
82 60 board_routes.with_options :conditions => {:method => :get} do |board_views|
83 61 board_views.connect 'projects/:project_id/boards', :action => 'index'
84 62 board_views.connect 'projects/:project_id/boards/new', :action => 'new'
85 63 board_views.connect 'projects/:project_id/boards/:id', :action => 'show'
86 64 board_views.connect 'projects/:project_id/boards/:id.:format', :action => 'show'
87 65 board_views.connect 'projects/:project_id/boards/:id/edit', :action => 'edit'
88 66 end
89 67 board_routes.with_options :conditions => {:method => :post} do |board_actions|
90 68 board_actions.connect 'projects/:project_id/boards', :action => 'new'
91 69 board_actions.connect 'projects/:project_id/boards/:id/:action', :action => /edit|destroy/
92 70 end
93 71 end
94 72
95 73 map.with_options :controller => 'documents' do |document_routes|
96 74 document_routes.with_options :conditions => {:method => :get} do |document_views|
97 75 document_views.connect 'projects/:project_id/documents', :action => 'index'
98 76 document_views.connect 'projects/:project_id/documents/new', :action => 'new'
99 77 document_views.connect 'documents/:id', :action => 'show'
100 78 document_views.connect 'documents/:id/edit', :action => 'edit'
101 79 end
102 80 document_routes.with_options :conditions => {:method => :post} do |document_actions|
103 81 document_actions.connect 'projects/:project_id/documents', :action => 'new'
104 82 document_actions.connect 'documents/:id/:action', :action => /destroy|edit/
105 83 end
106 84 end
107 85
108 86 map.resources :issue_moves, :only => [:new, :create], :path_prefix => '/issues', :as => 'move'
109 87
110 88 # Misc issue routes. TODO: move into resources
111 89 map.auto_complete_issues '/issues/auto_complete', :controller => 'auto_completes', :action => 'issues'
112 90 map.preview_issue '/issues/preview/:id', :controller => 'previews', :action => 'issue' # TODO: would look nicer as /issues/:id/preview
113 91 map.issues_context_menu '/issues/context_menu', :controller => 'context_menus', :action => 'issues'
114 92 map.issue_changes '/issues/changes', :controller => 'journals', :action => 'index'
115 93 map.bulk_edit_issue 'issues/bulk_edit', :controller => 'issues', :action => 'bulk_edit', :conditions => { :method => :get }
116 94 map.bulk_update_issue 'issues/bulk_edit', :controller => 'issues', :action => 'bulk_update', :conditions => { :method => :post }
117 95 map.quoted_issue '/issues/:id/quoted', :controller => 'journals', :action => 'new', :id => /\d+/, :conditions => { :method => :post }
118 96 map.connect '/issues/:id/destroy', :controller => 'issues', :action => 'destroy', :conditions => { :method => :post } # legacy
119 97
120 98 map.resource :gantt, :path_prefix => '/issues', :controller => 'gantts', :only => [:show, :update]
121 99 map.resource :gantt, :path_prefix => '/projects/:project_id/issues', :controller => 'gantts', :only => [:show, :update]
122 100 map.resource :calendar, :path_prefix => '/issues', :controller => 'calendars', :only => [:show, :update]
123 101 map.resource :calendar, :path_prefix => '/projects/:project_id/issues', :controller => 'calendars', :only => [:show, :update]
124 102
125 103 map.with_options :controller => 'reports', :conditions => {:method => :get} do |reports|
126 104 reports.connect 'projects/:id/issues/report', :action => 'issue_report'
127 105 reports.connect 'projects/:id/issues/report/:detail', :action => 'issue_report_details'
128 106 end
129 107
130 108 # Following two routes conflict with the resources because #index allows POST
131 109 map.connect '/issues', :controller => 'issues', :action => 'index', :conditions => { :method => :post }
132 110 map.connect '/issues/create', :controller => 'issues', :action => 'index', :conditions => { :method => :post }
133 111
134 map.resources :issues, :member => { :edit => :post }, :collection => {}
135 map.resources :issues, :path_prefix => '/projects/:project_id', :collection => { :create => :post }
112 map.resources :issues, :member => { :edit => :post }, :collection => {} do |issues|
113 issues.resources :time_entries, :controller => 'timelog'
114 end
115
116 map.resources :issues, :path_prefix => '/projects/:project_id', :collection => { :create => :post } do |issues|
117 issues.resources :time_entries, :controller => 'timelog'
118 end
136 119
137 120 map.with_options :controller => 'issue_relations', :conditions => {:method => :post} do |relations|
138 121 relations.connect 'issues/:issue_id/relations/:id', :action => 'new'
139 122 relations.connect 'issues/:issue_id/relations/:id/destroy', :action => 'destroy'
140 123 end
141 124
142 125 map.connect 'projects/:id/members/new', :controller => 'members', :action => 'new'
143 126
144 127 map.with_options :controller => 'users' do |users|
145 128 users.connect 'users/:id/edit/:tab', :action => 'edit', :tab => nil, :conditions => {:method => :get}
146 129
147 130 users.with_options :conditions => {:method => :post} do |user_actions|
148 131 user_actions.connect 'users/:id/memberships', :action => 'edit_membership'
149 132 user_actions.connect 'users/:id/memberships/:membership_id', :action => 'edit_membership'
150 133 user_actions.connect 'users/:id/memberships/:membership_id/destroy', :action => 'destroy_membership'
151 134 end
152 135 end
153 136
154 137 map.resources :users, :member => {
155 138 :edit_membership => :post,
156 139 :destroy_membership => :post
157 140 },
158 141 :except => [:destroy]
159 142
160 143 # For nice "roadmap" in the url for the index action
161 144 map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index'
162 145
163 146 map.all_news 'news', :controller => 'news', :action => 'index'
164 147 map.formatted_all_news 'news.:format', :controller => 'news', :action => 'index'
165 148 map.preview_news '/news/preview', :controller => 'previews', :action => 'news'
166 149 map.connect 'news/:id/comments', :controller => 'comments', :action => 'create', :conditions => {:method => :post}
167 150 map.connect 'news/:id/comments/:comment_id', :controller => 'comments', :action => 'destroy', :conditions => {:method => :delete}
168 151
169 152 map.resources :projects, :member => {
170 153 :copy => [:get, :post],
171 154 :settings => :get,
172 155 :modules => :post,
173 156 :archive => :post,
174 157 :unarchive => :post
175 158 } do |project|
176 159 project.resource :project_enumerations, :as => 'enumerations', :only => [:update, :destroy]
177 160 project.resources :files, :only => [:index, :new, :create]
178 161 project.resources :versions, :collection => {:close_completed => :put}, :member => {:status_by => :post}
179 162 project.resources :news, :shallow => true
163 project.resources :time_entries, :controller => 'timelog', :path_prefix => 'projects/:project_id'
164
165
180 166 end
181 167
182 168 # Destroy uses a get request to prompt the user before the actual DELETE request
183 169 map.project_destroy_confirm 'projects/:id/destroy', :controller => 'projects', :action => 'destroy', :conditions => {:method => :get}
184 170
185 171 # TODO: port to be part of the resources route(s)
186 172 map.with_options :controller => 'projects' do |project_mapper|
187 173 project_mapper.with_options :conditions => {:method => :get} do |project_views|
188 174 project_views.connect 'projects/:id/settings/:tab', :controller => 'projects', :action => 'settings'
189 175 project_views.connect 'projects/:project_id/issues/:copy_from/copy', :controller => 'issues', :action => 'new'
190 176 end
191 177 end
192 178
193 179 map.with_options :controller => 'activities', :action => 'index', :conditions => {:method => :get} do |activity|
194 180 activity.connect 'projects/:id/activity'
195 181 activity.connect 'projects/:id/activity.:format'
196 182 activity.connect 'activity', :id => nil
197 183 activity.connect 'activity.:format', :id => nil
198 184 end
199 185
200 186
201 187 map.with_options :controller => 'issue_categories' do |categories|
202 188 categories.connect 'projects/:project_id/issue_categories/new', :action => 'new'
203 189 end
204 190
205 191 map.with_options :controller => 'repositories' do |repositories|
206 192 repositories.with_options :conditions => {:method => :get} do |repository_views|
207 193 repository_views.connect 'projects/:id/repository', :action => 'show'
208 194 repository_views.connect 'projects/:id/repository/edit', :action => 'edit'
209 195 repository_views.connect 'projects/:id/repository/statistics', :action => 'stats'
210 196 repository_views.connect 'projects/:id/repository/revisions', :action => 'revisions'
211 197 repository_views.connect 'projects/:id/repository/revisions.:format', :action => 'revisions'
212 198 repository_views.connect 'projects/:id/repository/revisions/:rev', :action => 'revision'
213 199 repository_views.connect 'projects/:id/repository/revisions/:rev/diff', :action => 'diff'
214 200 repository_views.connect 'projects/:id/repository/revisions/:rev/diff.:format', :action => 'diff'
215 201 repository_views.connect 'projects/:id/repository/revisions/:rev/raw/*path', :action => 'entry', :format => 'raw', :requirements => { :rev => /[a-z0-9\.\-_]+/ }
216 202 repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path', :requirements => { :rev => /[a-z0-9\.\-_]+/ }
217 203 repository_views.connect 'projects/:id/repository/raw/*path', :action => 'entry', :format => 'raw'
218 204 # TODO: why the following route is required?
219 205 repository_views.connect 'projects/:id/repository/entry/*path', :action => 'entry'
220 206 repository_views.connect 'projects/:id/repository/:action/*path'
221 207 end
222 208
223 209 repositories.connect 'projects/:id/repository/:action', :conditions => {:method => :post}
224 210 end
225 211
226 212 map.connect 'attachments/:id', :controller => 'attachments', :action => 'show', :id => /\d+/
227 213 map.connect 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/
228 214 map.connect 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/
229 215
230 216 map.resources :groups
231 217
232 218 #left old routes at the bottom for backwards compat
233 219 map.connect 'projects/:project_id/issues/:action', :controller => 'issues'
234 220 map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
235 221 map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
236 222 map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
237 223 map.connect 'wiki/:id/:page/:action', :page => nil, :controller => 'wiki'
238 224 map.connect 'issues/:issue_id/relations/:action/:id', :controller => 'issue_relations'
239 225 map.connect 'projects/:project_id/news/:action', :controller => 'news'
240 226 map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog', :project_id => /.+/
241 227 map.with_options :controller => 'repositories' do |omap|
242 228 omap.repositories_show 'repositories/browse/:id/*path', :action => 'browse'
243 229 omap.repositories_changes 'repositories/changes/:id/*path', :action => 'changes'
244 230 omap.repositories_diff 'repositories/diff/:id/*path', :action => 'diff'
245 231 omap.repositories_entry 'repositories/entry/:id/*path', :action => 'entry'
246 232 omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
247 233 omap.connect 'repositories/revision/:id/:rev', :action => 'revision'
248 234 end
249 235
250 236 map.with_options :controller => 'sys' do |sys|
251 237 sys.connect 'sys/projects.:format', :action => 'projects', :conditions => {:method => :get}
252 238 sys.connect 'sys/projects/:id/repository.:format', :action => 'create_project_repository', :conditions => {:method => :post}
253 239 end
254 240
255 241 # Install the default route as the lowest priority.
256 242 map.connect ':controller/:action/:id'
257 243 map.connect 'robots.txt', :controller => 'welcome', :action => 'robots'
258 244 # Used for OpenID
259 245 map.root :controller => 'account', :action => 'login'
260 246 end
@@ -1,231 +1,231
1 1 # -*- coding: utf-8 -*-
2 2 # redMine - project management software
3 3 # Copyright (C) 2006-2007 Jean-Philippe Lang
4 4 #
5 5 # This program is free software; you can redistribute it and/or
6 6 # modify it under the terms of the GNU General Public License
7 7 # as published by the Free Software Foundation; either version 2
8 8 # of the License, or (at your option) any later version.
9 9 #
10 10 # This program is distributed in the hope that it will be useful,
11 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
12 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 13 # GNU General Public License for more details.
14 14 #
15 15 # You should have received a copy of the GNU General Public License
16 16 # along with this program; if not, write to the Free Software
17 17 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
18 18
19 19 require File.dirname(__FILE__) + '/../test_helper'
20 20 require 'timelog_controller'
21 21
22 22 # Re-raise errors caught by the controller.
23 23 class TimelogController; def rescue_action(e) raise e end; end
24 24
25 25 class TimelogControllerTest < ActionController::TestCase
26 26 fixtures :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses, :custom_fields, :custom_values
27 27
28 28 def setup
29 29 @controller = TimelogController.new
30 30 @request = ActionController::TestRequest.new
31 31 @response = ActionController::TestResponse.new
32 32 end
33 33
34 34 def test_get_new
35 35 @request.session[:user_id] = 3
36 36 get :new, :project_id => 1
37 37 assert_response :success
38 38 assert_template 'edit'
39 39 # Default activity selected
40 40 assert_tag :tag => 'option', :attributes => { :selected => 'selected' },
41 41 :content => 'Development'
42 42 end
43 43
44 44 def test_get_new_should_only_show_active_time_entry_activities
45 45 @request.session[:user_id] = 3
46 46 get :new, :project_id => 1
47 47 assert_response :success
48 48 assert_template 'edit'
49 49 assert_no_tag :tag => 'option', :content => 'Inactive Activity'
50 50
51 51 end
52 52
53 53 def test_get_edit_existing_time
54 54 @request.session[:user_id] = 2
55 55 get :edit, :id => 2, :project_id => nil
56 56 assert_response :success
57 57 assert_template 'edit'
58 58 # Default activity selected
59 assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/timelog/update/2' }
59 assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/time_entries/2' }
60 60 end
61 61
62 62 def test_get_edit_with_an_existing_time_entry_with_inactive_activity
63 63 te = TimeEntry.find(1)
64 64 te.activity = TimeEntryActivity.find_by_name("Inactive Activity")
65 65 te.save!
66 66
67 67 @request.session[:user_id] = 1
68 68 get :edit, :project_id => 1, :id => 1
69 69 assert_response :success
70 70 assert_template 'edit'
71 71 # Blank option since nothing is pre-selected
72 72 assert_tag :tag => 'option', :content => '--- Please select ---'
73 73 end
74 74
75 75 def test_post_create
76 76 # TODO: should POST to issues’ time log instead of project. change form
77 77 # and routing
78 78 @request.session[:user_id] = 3
79 79 post :create, :project_id => 1,
80 80 :time_entry => {:comments => 'Some work on TimelogControllerTest',
81 81 # Not the default activity
82 82 :activity_id => '11',
83 83 :spent_on => '2008-03-14',
84 84 :issue_id => '1',
85 85 :hours => '7.3'}
86 86 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
87 87
88 88 i = Issue.find(1)
89 89 t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
90 90 assert_not_nil t
91 91 assert_equal 11, t.activity_id
92 92 assert_equal 7.3, t.hours
93 93 assert_equal 3, t.user_id
94 94 assert_equal i, t.issue
95 95 assert_equal i.project, t.project
96 96 end
97 97
98 98 def test_update
99 99 entry = TimeEntry.find(1)
100 100 assert_equal 1, entry.issue_id
101 101 assert_equal 2, entry.user_id
102 102
103 103 @request.session[:user_id] = 1
104 104 put :update, :id => 1,
105 105 :time_entry => {:issue_id => '2',
106 106 :hours => '8'}
107 107 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
108 108 entry.reload
109 109
110 110 assert_equal 8, entry.hours
111 111 assert_equal 2, entry.issue_id
112 112 assert_equal 2, entry.user_id
113 113 end
114 114
115 115 def test_destroy
116 116 @request.session[:user_id] = 2
117 post :destroy, :id => 1
117 delete :destroy, :id => 1
118 118 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
119 119 assert_equal I18n.t(:notice_successful_delete), flash[:notice]
120 120 assert_nil TimeEntry.find_by_id(1)
121 121 end
122 122
123 123 def test_destroy_should_fail
124 124 # simulate that this fails (e.g. due to a plugin), see #5700
125 125 TimeEntry.class_eval do
126 126 before_destroy :stop_callback_chain
127 127 def stop_callback_chain ; return false ; end
128 128 end
129 129
130 130 @request.session[:user_id] = 2
131 post :destroy, :id => 1
131 delete :destroy, :id => 1
132 132 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
133 133 assert_equal I18n.t(:notice_unable_delete_time_entry), flash[:error]
134 134 assert_not_nil TimeEntry.find_by_id(1)
135 135
136 136 # remove the simulation
137 137 TimeEntry.before_destroy.reject! {|callback| callback.method == :stop_callback_chain }
138 138 end
139 139
140 140 def test_index_all_projects
141 141 get :index
142 142 assert_response :success
143 143 assert_template 'index'
144 144 assert_not_nil assigns(:total_hours)
145 145 assert_equal "162.90", "%.2f" % assigns(:total_hours)
146 146 end
147 147
148 148 def test_index_at_project_level
149 149 get :index, :project_id => 1
150 150 assert_response :success
151 151 assert_template 'index'
152 152 assert_not_nil assigns(:entries)
153 153 assert_equal 4, assigns(:entries).size
154 154 # project and subproject
155 155 assert_equal [1, 3], assigns(:entries).collect(&:project_id).uniq.sort
156 156 assert_not_nil assigns(:total_hours)
157 157 assert_equal "162.90", "%.2f" % assigns(:total_hours)
158 158 # display all time by default
159 159 assert_equal '2007-03-12'.to_date, assigns(:from)
160 160 assert_equal '2007-04-22'.to_date, assigns(:to)
161 161 end
162 162
163 163 def test_index_at_project_level_with_date_range
164 164 get :index, :project_id => 1, :from => '2007-03-20', :to => '2007-04-30'
165 165 assert_response :success
166 166 assert_template 'index'
167 167 assert_not_nil assigns(:entries)
168 168 assert_equal 3, assigns(:entries).size
169 169 assert_not_nil assigns(:total_hours)
170 170 assert_equal "12.90", "%.2f" % assigns(:total_hours)
171 171 assert_equal '2007-03-20'.to_date, assigns(:from)
172 172 assert_equal '2007-04-30'.to_date, assigns(:to)
173 173 end
174 174
175 175 def test_index_at_project_level_with_period
176 176 get :index, :project_id => 1, :period => '7_days'
177 177 assert_response :success
178 178 assert_template 'index'
179 179 assert_not_nil assigns(:entries)
180 180 assert_not_nil assigns(:total_hours)
181 181 assert_equal Date.today - 7, assigns(:from)
182 182 assert_equal Date.today, assigns(:to)
183 183 end
184 184
185 185 def test_index_one_day
186 186 get :index, :project_id => 1, :from => "2007-03-23", :to => "2007-03-23"
187 187 assert_response :success
188 188 assert_template 'index'
189 189 assert_not_nil assigns(:total_hours)
190 190 assert_equal "4.25", "%.2f" % assigns(:total_hours)
191 191 end
192 192
193 193 def test_index_at_issue_level
194 194 get :index, :issue_id => 1
195 195 assert_response :success
196 196 assert_template 'index'
197 197 assert_not_nil assigns(:entries)
198 198 assert_equal 2, assigns(:entries).size
199 199 assert_not_nil assigns(:total_hours)
200 200 assert_equal 154.25, assigns(:total_hours)
201 201 # display all time based on what's been logged
202 202 assert_equal '2007-03-12'.to_date, assigns(:from)
203 203 assert_equal '2007-04-22'.to_date, assigns(:to)
204 204 end
205 205
206 206 def test_index_atom_feed
207 207 get :index, :project_id => 1, :format => 'atom'
208 208 assert_response :success
209 209 assert_equal 'application/atom+xml', @response.content_type
210 210 assert_not_nil assigns(:items)
211 211 assert assigns(:items).first.is_a?(TimeEntry)
212 212 end
213 213
214 214 def test_index_all_projects_csv_export
215 215 Setting.date_format = '%m/%d/%Y'
216 216 get :index, :format => 'csv'
217 217 assert_response :success
218 218 assert_equal 'text/csv', @response.content_type
219 219 assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
220 220 assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
221 221 end
222 222
223 223 def test_index_csv_export
224 224 Setting.date_format = '%m/%d/%Y'
225 225 get :index, :project_id => 1, :format => 'csv'
226 226 assert_response :success
227 227 assert_equal 'text/csv', @response.content_type
228 228 assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
229 229 assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
230 230 end
231 231 end
@@ -1,310 +1,343
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2010 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require "#{File.dirname(__FILE__)}/../test_helper"
19 19
20 20 class RoutingTest < ActionController::IntegrationTest
21 21 context "activities" do
22 22 should_route :get, "/activity", :controller => 'activities', :action => 'index', :id => nil
23 23 should_route :get, "/activity.atom", :controller => 'activities', :action => 'index', :id => nil, :format => 'atom'
24 24 end
25 25
26 26 context "attachments" do
27 27 should_route :get, "/attachments/1", :controller => 'attachments', :action => 'show', :id => '1'
28 28 should_route :get, "/attachments/1/filename.ext", :controller => 'attachments', :action => 'show', :id => '1', :filename => 'filename.ext'
29 29 should_route :get, "/attachments/download/1", :controller => 'attachments', :action => 'download', :id => '1'
30 30 should_route :get, "/attachments/download/1/filename.ext", :controller => 'attachments', :action => 'download', :id => '1', :filename => 'filename.ext'
31 31 end
32 32
33 33 context "boards" do
34 34 should_route :get, "/projects/world_domination/boards", :controller => 'boards', :action => 'index', :project_id => 'world_domination'
35 35 should_route :get, "/projects/world_domination/boards/new", :controller => 'boards', :action => 'new', :project_id => 'world_domination'
36 36 should_route :get, "/projects/world_domination/boards/44", :controller => 'boards', :action => 'show', :project_id => 'world_domination', :id => '44'
37 37 should_route :get, "/projects/world_domination/boards/44.atom", :controller => 'boards', :action => 'show', :project_id => 'world_domination', :id => '44', :format => 'atom'
38 38 should_route :get, "/projects/world_domination/boards/44/edit", :controller => 'boards', :action => 'edit', :project_id => 'world_domination', :id => '44'
39 39
40 40 should_route :post, "/projects/world_domination/boards/new", :controller => 'boards', :action => 'new', :project_id => 'world_domination'
41 41 should_route :post, "/projects/world_domination/boards/44/edit", :controller => 'boards', :action => 'edit', :project_id => 'world_domination', :id => '44'
42 42 should_route :post, "/projects/world_domination/boards/44/destroy", :controller => 'boards', :action => 'destroy', :project_id => 'world_domination', :id => '44'
43 43
44 44 end
45 45
46 46 context "documents" do
47 47 should_route :get, "/projects/567/documents", :controller => 'documents', :action => 'index', :project_id => '567'
48 48 should_route :get, "/projects/567/documents/new", :controller => 'documents', :action => 'new', :project_id => '567'
49 49 should_route :get, "/documents/22", :controller => 'documents', :action => 'show', :id => '22'
50 50 should_route :get, "/documents/22/edit", :controller => 'documents', :action => 'edit', :id => '22'
51 51
52 52 should_route :post, "/projects/567/documents/new", :controller => 'documents', :action => 'new', :project_id => '567'
53 53 should_route :post, "/documents/567/edit", :controller => 'documents', :action => 'edit', :id => '567'
54 54 should_route :post, "/documents/567/destroy", :controller => 'documents', :action => 'destroy', :id => '567'
55 55 end
56 56
57 57 context "issues" do
58 58 # REST actions
59 59 should_route :get, "/issues", :controller => 'issues', :action => 'index'
60 60 should_route :get, "/issues.pdf", :controller => 'issues', :action => 'index', :format => 'pdf'
61 61 should_route :get, "/issues.atom", :controller => 'issues', :action => 'index', :format => 'atom'
62 62 should_route :get, "/issues.xml", :controller => 'issues', :action => 'index', :format => 'xml'
63 63 should_route :get, "/projects/23/issues", :controller => 'issues', :action => 'index', :project_id => '23'
64 64 should_route :get, "/projects/23/issues.pdf", :controller => 'issues', :action => 'index', :project_id => '23', :format => 'pdf'
65 65 should_route :get, "/projects/23/issues.atom", :controller => 'issues', :action => 'index', :project_id => '23', :format => 'atom'
66 66 should_route :get, "/projects/23/issues.xml", :controller => 'issues', :action => 'index', :project_id => '23', :format => 'xml'
67 67 should_route :get, "/issues/64", :controller => 'issues', :action => 'show', :id => '64'
68 68 should_route :get, "/issues/64.pdf", :controller => 'issues', :action => 'show', :id => '64', :format => 'pdf'
69 69 should_route :get, "/issues/64.atom", :controller => 'issues', :action => 'show', :id => '64', :format => 'atom'
70 70 should_route :get, "/issues/64.xml", :controller => 'issues', :action => 'show', :id => '64', :format => 'xml'
71 71
72 72 should_route :get, "/projects/23/issues/new", :controller => 'issues', :action => 'new', :project_id => '23'
73 73 should_route :post, "/projects/23/issues", :controller => 'issues', :action => 'create', :project_id => '23'
74 74 should_route :post, "/issues.xml", :controller => 'issues', :action => 'create', :format => 'xml'
75 75
76 76 should_route :get, "/issues/64/edit", :controller => 'issues', :action => 'edit', :id => '64'
77 77 # TODO: Should use PUT
78 78 should_route :post, "/issues/64/edit", :controller => 'issues', :action => 'edit', :id => '64'
79 79 should_route :put, "/issues/1.xml", :controller => 'issues', :action => 'update', :id => '1', :format => 'xml'
80 80
81 81 # TODO: Should use DELETE
82 82 should_route :post, "/issues/64/destroy", :controller => 'issues', :action => 'destroy', :id => '64'
83 83 should_route :delete, "/issues/1.xml", :controller => 'issues', :action => 'destroy', :id => '1', :format => 'xml'
84 84
85 85 # Extra actions
86 86 should_route :get, "/projects/23/issues/64/copy", :controller => 'issues', :action => 'new', :project_id => '23', :copy_from => '64'
87 87
88 88 should_route :get, "/issues/move/new", :controller => 'issue_moves', :action => 'new'
89 89 should_route :post, "/issues/move", :controller => 'issue_moves', :action => 'create'
90 90
91 91 should_route :post, "/issues/1/quoted", :controller => 'journals', :action => 'new', :id => '1'
92 92
93 93 should_route :get, "/issues/calendar", :controller => 'calendars', :action => 'show'
94 94 should_route :put, "/issues/calendar", :controller => 'calendars', :action => 'update'
95 95 should_route :get, "/projects/project-name/issues/calendar", :controller => 'calendars', :action => 'show', :project_id => 'project-name'
96 96 should_route :put, "/projects/project-name/issues/calendar", :controller => 'calendars', :action => 'update', :project_id => 'project-name'
97 97
98 98 should_route :get, "/issues/gantt", :controller => 'gantts', :action => 'show'
99 99 should_route :put, "/issues/gantt", :controller => 'gantts', :action => 'update'
100 100 should_route :get, "/projects/project-name/issues/gantt", :controller => 'gantts', :action => 'show', :project_id => 'project-name'
101 101 should_route :put, "/projects/project-name/issues/gantt", :controller => 'gantts', :action => 'update', :project_id => 'project-name'
102 102
103 103 should_route :get, "/issues/auto_complete", :controller => 'auto_completes', :action => 'issues'
104 104
105 105 should_route :get, "/issues/preview/123", :controller => 'previews', :action => 'issue', :id => '123'
106 106 should_route :post, "/issues/preview/123", :controller => 'previews', :action => 'issue', :id => '123'
107 107 should_route :get, "/issues/context_menu", :controller => 'context_menus', :action => 'issues'
108 108 should_route :post, "/issues/context_menu", :controller => 'context_menus', :action => 'issues'
109 109
110 110 should_route :get, "/issues/changes", :controller => 'journals', :action => 'index'
111 111
112 112 should_route :get, "/issues/bulk_edit", :controller => 'issues', :action => 'bulk_edit'
113 113 should_route :post, "/issues/bulk_edit", :controller => 'issues', :action => 'bulk_update'
114 114 end
115 115
116 116 context "issue categories" do
117 117 should_route :get, "/projects/test/issue_categories/new", :controller => 'issue_categories', :action => 'new', :project_id => 'test'
118 118
119 119 should_route :post, "/projects/test/issue_categories/new", :controller => 'issue_categories', :action => 'new', :project_id => 'test'
120 120 end
121 121
122 122 context "issue relations" do
123 123 should_route :post, "/issues/1/relations", :controller => 'issue_relations', :action => 'new', :issue_id => '1'
124 124 should_route :post, "/issues/1/relations/23/destroy", :controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23'
125 125 end
126 126
127 127 context "issue reports" do
128 128 should_route :get, "/projects/567/issues/report", :controller => 'reports', :action => 'issue_report', :id => '567'
129 129 should_route :get, "/projects/567/issues/report/assigned_to", :controller => 'reports', :action => 'issue_report_details', :id => '567', :detail => 'assigned_to'
130 130 end
131 131
132 132 context "members" do
133 133 should_route :post, "/projects/5234/members/new", :controller => 'members', :action => 'new', :id => '5234'
134 134 end
135 135
136 136 context "messages" do
137 137 should_route :get, "/boards/22/topics/2", :controller => 'messages', :action => 'show', :id => '2', :board_id => '22'
138 138 should_route :get, "/boards/lala/topics/new", :controller => 'messages', :action => 'new', :board_id => 'lala'
139 139 should_route :get, "/boards/lala/topics/22/edit", :controller => 'messages', :action => 'edit', :id => '22', :board_id => 'lala'
140 140
141 141 should_route :post, "/boards/lala/topics/new", :controller => 'messages', :action => 'new', :board_id => 'lala'
142 142 should_route :post, "/boards/lala/topics/22/edit", :controller => 'messages', :action => 'edit', :id => '22', :board_id => 'lala'
143 143 should_route :post, "/boards/22/topics/555/replies", :controller => 'messages', :action => 'reply', :id => '555', :board_id => '22'
144 144 should_route :post, "/boards/22/topics/555/destroy", :controller => 'messages', :action => 'destroy', :id => '555', :board_id => '22'
145 145 end
146 146
147 147 context "news" do
148 148 should_route :get, "/news", :controller => 'news', :action => 'index'
149 149 should_route :get, "/news.atom", :controller => 'news', :action => 'index', :format => 'atom'
150 150 should_route :get, "/news.xml", :controller => 'news', :action => 'index', :format => 'xml'
151 151 should_route :get, "/news.json", :controller => 'news', :action => 'index', :format => 'json'
152 152 should_route :get, "/projects/567/news", :controller => 'news', :action => 'index', :project_id => '567'
153 153 should_route :get, "/projects/567/news.atom", :controller => 'news', :action => 'index', :format => 'atom', :project_id => '567'
154 154 should_route :get, "/projects/567/news.xml", :controller => 'news', :action => 'index', :format => 'xml', :project_id => '567'
155 155 should_route :get, "/projects/567/news.json", :controller => 'news', :action => 'index', :format => 'json', :project_id => '567'
156 156 should_route :get, "/news/2", :controller => 'news', :action => 'show', :id => '2'
157 157 should_route :get, "/projects/567/news/new", :controller => 'news', :action => 'new', :project_id => '567'
158 158 should_route :get, "/news/234", :controller => 'news', :action => 'show', :id => '234'
159 159 should_route :get, "/news/567/edit", :controller => 'news', :action => 'edit', :id => '567'
160 160 should_route :get, "/news/preview", :controller => 'previews', :action => 'news'
161 161
162 162 should_route :post, "/projects/567/news", :controller => 'news', :action => 'create', :project_id => '567'
163 163 should_route :post, "/news/567/comments", :controller => 'comments', :action => 'create', :id => '567'
164 164
165 165 should_route :put, "/news/567", :controller => 'news', :action => 'update', :id => '567'
166 166
167 167 should_route :delete, "/news/567", :controller => 'news', :action => 'destroy', :id => '567'
168 168 should_route :delete, "/news/567/comments/15", :controller => 'comments', :action => 'destroy', :id => '567', :comment_id => '15'
169 169 end
170 170
171 171 context "projects" do
172 172 should_route :get, "/projects", :controller => 'projects', :action => 'index'
173 173 should_route :get, "/projects.atom", :controller => 'projects', :action => 'index', :format => 'atom'
174 174 should_route :get, "/projects.xml", :controller => 'projects', :action => 'index', :format => 'xml'
175 175 should_route :get, "/projects/new", :controller => 'projects', :action => 'new'
176 176 should_route :get, "/projects/test", :controller => 'projects', :action => 'show', :id => 'test'
177 177 should_route :get, "/projects/1.xml", :controller => 'projects', :action => 'show', :id => '1', :format => 'xml'
178 178 should_route :get, "/projects/4223/settings", :controller => 'projects', :action => 'settings', :id => '4223'
179 179 should_route :get, "/projects/4223/settings/members", :controller => 'projects', :action => 'settings', :id => '4223', :tab => 'members'
180 180 should_route :get, "/projects/33/files", :controller => 'files', :action => 'index', :project_id => '33'
181 181 should_route :get, "/projects/33/files/new", :controller => 'files', :action => 'new', :project_id => '33'
182 182 should_route :get, "/projects/33/roadmap", :controller => 'versions', :action => 'index', :project_id => '33'
183 183 should_route :get, "/projects/33/activity", :controller => 'activities', :action => 'index', :id => '33'
184 184 should_route :get, "/projects/33/activity.atom", :controller => 'activities', :action => 'index', :id => '33', :format => 'atom'
185 185
186 186 should_route :post, "/projects", :controller => 'projects', :action => 'create'
187 187 should_route :post, "/projects.xml", :controller => 'projects', :action => 'create', :format => 'xml'
188 188 should_route :post, "/projects/33/files", :controller => 'files', :action => 'create', :project_id => '33'
189 189 should_route :post, "/projects/64/archive", :controller => 'projects', :action => 'archive', :id => '64'
190 190 should_route :post, "/projects/64/unarchive", :controller => 'projects', :action => 'unarchive', :id => '64'
191 191
192 192 should_route :put, "/projects/64/enumerations", :controller => 'project_enumerations', :action => 'update', :project_id => '64'
193 193 should_route :put, "/projects/4223", :controller => 'projects', :action => 'update', :id => '4223'
194 194 should_route :put, "/projects/1.xml", :controller => 'projects', :action => 'update', :id => '1', :format => 'xml'
195 195
196 196 should_route :delete, "/projects/64", :controller => 'projects', :action => 'destroy', :id => '64'
197 197 should_route :delete, "/projects/1.xml", :controller => 'projects', :action => 'destroy', :id => '1', :format => 'xml'
198 198 should_route :delete, "/projects/64/enumerations", :controller => 'project_enumerations', :action => 'destroy', :project_id => '64'
199 199 end
200 200
201 201 context "repositories" do
202 202 should_route :get, "/projects/redmine/repository", :controller => 'repositories', :action => 'show', :id => 'redmine'
203 203 should_route :get, "/projects/redmine/repository/edit", :controller => 'repositories', :action => 'edit', :id => 'redmine'
204 204 should_route :get, "/projects/redmine/repository/revisions", :controller => 'repositories', :action => 'revisions', :id => 'redmine'
205 205 should_route :get, "/projects/redmine/repository/revisions.atom", :controller => 'repositories', :action => 'revisions', :id => 'redmine', :format => 'atom'
206 206 should_route :get, "/projects/redmine/repository/revisions/2457", :controller => 'repositories', :action => 'revision', :id => 'redmine', :rev => '2457'
207 207 should_route :get, "/projects/redmine/repository/revisions/2457/diff", :controller => 'repositories', :action => 'diff', :id => 'redmine', :rev => '2457'
208 208 should_route :get, "/projects/redmine/repository/revisions/2457/diff.diff", :controller => 'repositories', :action => 'diff', :id => 'redmine', :rev => '2457', :format => 'diff'
209 209 should_route :get, "/projects/redmine/repository/diff/path/to/file.c", :controller => 'repositories', :action => 'diff', :id => 'redmine', :path => %w[path to file.c]
210 210 should_route :get, "/projects/redmine/repository/revisions/2/diff/path/to/file.c", :controller => 'repositories', :action => 'diff', :id => 'redmine', :path => %w[path to file.c], :rev => '2'
211 211 should_route :get, "/projects/redmine/repository/browse/path/to/file.c", :controller => 'repositories', :action => 'browse', :id => 'redmine', :path => %w[path to file.c]
212 212 should_route :get, "/projects/redmine/repository/entry/path/to/file.c", :controller => 'repositories', :action => 'entry', :id => 'redmine', :path => %w[path to file.c]
213 213 should_route :get, "/projects/redmine/repository/revisions/2/entry/path/to/file.c", :controller => 'repositories', :action => 'entry', :id => 'redmine', :path => %w[path to file.c], :rev => '2'
214 214 should_route :get, "/projects/redmine/repository/raw/path/to/file.c", :controller => 'repositories', :action => 'entry', :id => 'redmine', :path => %w[path to file.c], :format => 'raw'
215 215 should_route :get, "/projects/redmine/repository/revisions/2/raw/path/to/file.c", :controller => 'repositories', :action => 'entry', :id => 'redmine', :path => %w[path to file.c], :rev => '2', :format => 'raw'
216 216 should_route :get, "/projects/redmine/repository/annotate/path/to/file.c", :controller => 'repositories', :action => 'annotate', :id => 'redmine', :path => %w[path to file.c]
217 217 should_route :get, "/projects/redmine/repository/changes/path/to/file.c", :controller => 'repositories', :action => 'changes', :id => 'redmine', :path => %w[path to file.c]
218 218 should_route :get, "/projects/redmine/repository/statistics", :controller => 'repositories', :action => 'stats', :id => 'redmine'
219 219
220 220
221 221 should_route :post, "/projects/redmine/repository/edit", :controller => 'repositories', :action => 'edit', :id => 'redmine'
222 222 end
223 223
224 context "timelogs" do
224 context "timelogs (global)" do
225 225 should_route :get, "/time_entries", :controller => 'timelog', :action => 'index'
226 226 should_route :get, "/time_entries.csv", :controller => 'timelog', :action => 'index', :format => 'csv'
227 227 should_route :get, "/time_entries.atom", :controller => 'timelog', :action => 'index', :format => 'atom'
228 should_route :get, "/time_entries/new", :controller => 'timelog', :action => 'new'
229 should_route :get, "/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22'
230
231 should_route :post, "/time_entries", :controller => 'timelog', :action => 'create'
232
233 should_route :put, "/time_entries/22", :controller => 'timelog', :action => 'update', :id => '22'
234
235 should_route :delete, "/time_entries/55", :controller => 'timelog', :action => 'destroy', :id => '55'
236 end
237
238 context "timelogs (scoped under project)" do
228 239 should_route :get, "/projects/567/time_entries", :controller => 'timelog', :action => 'index', :project_id => '567'
229 240 should_route :get, "/projects/567/time_entries.csv", :controller => 'timelog', :action => 'index', :project_id => '567', :format => 'csv'
230 241 should_route :get, "/projects/567/time_entries.atom", :controller => 'timelog', :action => 'index', :project_id => '567', :format => 'atom'
242 should_route :get, "/projects/567/time_entries/new", :controller => 'timelog', :action => 'new', :project_id => '567'
243 should_route :get, "/projects/567/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22', :project_id => '567'
244
245 should_route :post, "/projects/567/time_entries", :controller => 'timelog', :action => 'create', :project_id => '567'
246
247 should_route :put, "/projects/567/time_entries/22", :controller => 'timelog', :action => 'update', :id => '22', :project_id => '567'
248
249 should_route :delete, "/projects/567/time_entries/55", :controller => 'timelog', :action => 'destroy', :id => '55', :project_id => '567'
250 end
251
252 context "timelogs (scoped under issues)" do
231 253 should_route :get, "/issues/234/time_entries", :controller => 'timelog', :action => 'index', :issue_id => '234'
232 254 should_route :get, "/issues/234/time_entries.csv", :controller => 'timelog', :action => 'index', :issue_id => '234', :format => 'csv'
233 255 should_route :get, "/issues/234/time_entries.atom", :controller => 'timelog', :action => 'index', :issue_id => '234', :format => 'atom'
234 should_route :get, "/projects/ecookbook/issues/123/time_entries", :controller => 'timelog', :action => 'index', :project_id => 'ecookbook', :issue_id => '123'
256 should_route :get, "/issues/234/time_entries/new", :controller => 'timelog', :action => 'new', :issue_id => '234'
257 should_route :get, "/issues/234/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22', :issue_id => '234'
235 258
236 should_route :get, "/issues/567/time_entries/new", :controller => 'timelog', :action => 'new', :issue_id => '567'
237 should_route :get, "/projects/ecookbook/time_entries/new", :controller => 'timelog', :action => 'new', :project_id => 'ecookbook'
238 should_route :get, "/projects/ecookbook/issues/567/time_entries/new", :controller => 'timelog', :action => 'new', :project_id => 'ecookbook', :issue_id => '567'
239 should_route :get, "/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22'
259 should_route :post, "/issues/234/time_entries", :controller => 'timelog', :action => 'create', :issue_id => '234'
240 260
241 should_route :post, "/projects/ecookbook/timelog/edit", :controller => 'timelog', :action => 'create', :project_id => 'ecookbook'
242 should_route :post, "/time_entries/55/destroy", :controller => 'timelog', :action => 'destroy', :id => '55'
261 should_route :put, "/issues/234/time_entries/22", :controller => 'timelog', :action => 'update', :id => '22', :issue_id => '234'
243 262
244 should_route :put, "/time_entries/22", :controller => 'timelog', :action => 'update', :id => '22'
263 should_route :delete, "/issues/234/time_entries/55", :controller => 'timelog', :action => 'destroy', :id => '55', :issue_id => '234'
264 end
265
266 context "timelogs (scoped under project and issues)" do
267 should_route :get, "/projects/ecookbook/issues/234/time_entries", :controller => 'timelog', :action => 'index', :issue_id => '234', :project_id => 'ecookbook'
268 should_route :get, "/projects/ecookbook/issues/234/time_entries.csv", :controller => 'timelog', :action => 'index', :issue_id => '234', :project_id => 'ecookbook', :format => 'csv'
269 should_route :get, "/projects/ecookbook/issues/234/time_entries.atom", :controller => 'timelog', :action => 'index', :issue_id => '234', :project_id => 'ecookbook', :format => 'atom'
270 should_route :get, "/projects/ecookbook/issues/234/time_entries/new", :controller => 'timelog', :action => 'new', :issue_id => '234', :project_id => 'ecookbook'
271 should_route :get, "/projects/ecookbook/issues/234/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22', :issue_id => '234', :project_id => 'ecookbook'
272
273 should_route :post, "/projects/ecookbook/issues/234/time_entries", :controller => 'timelog', :action => 'create', :issue_id => '234', :project_id => 'ecookbook'
274
275 should_route :put, "/projects/ecookbook/issues/234/time_entries/22", :controller => 'timelog', :action => 'update', :id => '22', :issue_id => '234', :project_id => 'ecookbook'
276
277 should_route :delete, "/projects/ecookbook/issues/234/time_entries/55", :controller => 'timelog', :action => 'destroy', :id => '55', :issue_id => '234', :project_id => 'ecookbook'
245 278 end
246 279
247 280 context "time_entry_reports" do
248 281 should_route :get, "/time_entries/report", :controller => 'time_entry_reports', :action => 'report'
249 282 should_route :get, "/projects/567/time_entries/report", :controller => 'time_entry_reports', :action => 'report', :project_id => '567'
250 283 should_route :get, "/projects/567/time_entries/report.csv", :controller => 'time_entry_reports', :action => 'report', :project_id => '567', :format => 'csv'
251 284 end
252 285
253 286 context "users" do
254 287 should_route :get, "/users", :controller => 'users', :action => 'index'
255 288 should_route :get, "/users/44", :controller => 'users', :action => 'show', :id => '44'
256 289 should_route :get, "/users/new", :controller => 'users', :action => 'new'
257 290 should_route :get, "/users/444/edit", :controller => 'users', :action => 'edit', :id => '444'
258 291 should_route :get, "/users/222/edit/membership", :controller => 'users', :action => 'edit', :id => '222', :tab => 'membership'
259 292
260 293 should_route :post, "/users", :controller => 'users', :action => 'create'
261 294 should_route :post, "/users/123/memberships", :controller => 'users', :action => 'edit_membership', :id => '123'
262 295 should_route :post, "/users/123/memberships/55", :controller => 'users', :action => 'edit_membership', :id => '123', :membership_id => '55'
263 296 should_route :post, "/users/567/memberships/12/destroy", :controller => 'users', :action => 'destroy_membership', :id => '567', :membership_id => '12'
264 297
265 298 should_route :put, "/users/444", :controller => 'users', :action => 'update', :id => '444'
266 299 end
267 300
268 301 # TODO: should they all be scoped under /projects/:project_id ?
269 302 context "versions" do
270 303 should_route :get, "/projects/foo/versions/new", :controller => 'versions', :action => 'new', :project_id => 'foo'
271 304 should_route :get, "/versions/show/1", :controller => 'versions', :action => 'show', :id => '1'
272 305 should_route :get, "/versions/edit/1", :controller => 'versions', :action => 'edit', :id => '1'
273 306
274 307 should_route :post, "/projects/foo/versions", :controller => 'versions', :action => 'create', :project_id => 'foo'
275 308 should_route :post, "/versions/update/1", :controller => 'versions', :action => 'update', :id => '1'
276 309
277 310 should_route :delete, "/versions/destroy/1", :controller => 'versions', :action => 'destroy', :id => '1'
278 311 end
279 312
280 313 context "wiki (singular, project's pages)" do
281 314 should_route :get, "/projects/567/wiki", :controller => 'wiki', :action => 'index', :id => '567'
282 315 should_route :get, "/projects/567/wiki/lalala", :controller => 'wiki', :action => 'index', :id => '567', :page => 'lalala'
283 316 should_route :get, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :id => '567', :page => 'my_page'
284 317 should_route :get, "/projects/1/wiki/CookBook_documentation/history", :controller => 'wiki', :action => 'history', :id => '1', :page => 'CookBook_documentation'
285 318 should_route :get, "/projects/1/wiki/CookBook_documentation/diff/2/vs/1", :controller => 'wiki', :action => 'diff', :id => '1', :page => 'CookBook_documentation', :version => '2', :version_from => '1'
286 319 should_route :get, "/projects/1/wiki/CookBook_documentation/annotate/2", :controller => 'wiki', :action => 'annotate', :id => '1', :page => 'CookBook_documentation', :version => '2'
287 320 should_route :get, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :id => '22', :page => 'ladida'
288 321 should_route :get, "/projects/567/wiki/page_index", :controller => 'wiki', :action => 'special', :id => '567', :page => 'page_index'
289 322 should_route :get, "/projects/567/wiki/Page_Index", :controller => 'wiki', :action => 'special', :id => '567', :page => 'Page_Index'
290 323 should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'special', :id => '567', :page => 'date_index'
291 324 should_route :get, "/projects/567/wiki/export", :controller => 'wiki', :action => 'special', :id => '567', :page => 'export'
292 325
293 326 should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :id => '567', :page => 'my_page'
294 327 should_route :post, "/projects/567/wiki/CookBook_documentation/preview", :controller => 'wiki', :action => 'preview', :id => '567', :page => 'CookBook_documentation'
295 328 should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :id => '22', :page => 'ladida'
296 329 should_route :post, "/projects/22/wiki/ladida/destroy", :controller => 'wiki', :action => 'destroy', :id => '22', :page => 'ladida'
297 330 should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :id => '22', :page => 'ladida'
298 331 end
299 332
300 333 context "wikis (plural, admin setup)" do
301 334 should_route :get, "/projects/ladida/wiki/destroy", :controller => 'wikis', :action => 'destroy', :id => 'ladida'
302 335
303 336 should_route :post, "/projects/ladida/wiki", :controller => 'wikis', :action => 'edit', :id => 'ladida'
304 337 should_route :post, "/projects/ladida/wiki/destroy", :controller => 'wikis', :action => 'destroy', :id => 'ladida'
305 338 end
306 339
307 340 context "administration panel" do
308 341 should_route :get, "/admin/projects", :controller => 'admin', :action => 'projects'
309 342 end
310 343 end
General Comments 0
You need to be logged in to leave comments. Login now