| @@ -17,7 +17,9 | |||
|
|
17 | 17 | |
|
|
18 | 18 | class VersionsController < ApplicationController |
|
|
19 | 19 | menu_item :roadmap |
|
|
20 |
before_filter :find_ |
|
|
|
20 | before_filter :find_version, :except => :close_completed | |
|
|
21 | before_filter :find_project, :only => :close_completed | |
|
|
22 | before_filter :authorize | |
|
|
21 | 23 | |
|
|
22 | 24 | def show |
|
|
23 | 25 | end |
| @@ -29,6 +31,13 class VersionsController < ApplicationController | |||
|
|
29 | 31 | end |
|
|
30 | 32 | end |
|
|
31 | 33 | |
|
|
34 | def close_completed | |
|
|
35 | if request.post? | |
|
|
36 | @project.close_completed_versions | |
|
|
37 | end | |
|
|
38 | redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project | |
|
|
39 | end | |
|
|
40 | ||
|
|
32 | 41 | def destroy |
|
|
33 | 42 | @version.destroy |
|
|
34 | 43 | redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project |
| @@ -45,10 +54,16 class VersionsController < ApplicationController | |||
|
|
45 | 54 | end |
|
|
46 | 55 | |
|
|
47 | 56 | private |
|
|
48 |
def find_ |
|
|
|
57 | def find_version | |
|
|
49 | 58 | @version = Version.find(params[:id]) |
|
|
50 | 59 | @project = @version.project |
|
|
51 | 60 | rescue ActiveRecord::RecordNotFound |
|
|
52 | 61 | render_404 |
|
|
53 | 62 |
end |
|
|
63 | ||
|
|
64 | def find_project | |
|
|
65 | @project = Project.find(params[:project_id]) | |
|
|
66 | rescue ActiveRecord::RecordNotFound | |
|
|
67 | render_404 | |
|
|
68 | end | |
|
|
54 | 69 | end |
| @@ -304,6 +304,17 class Project < ActiveRecord::Base | |||
|
|
304 | 304 | :order => "#{Tracker.table_name}.position") |
|
|
305 | 305 | end |
|
|
306 | 306 | |
|
|
307 | # Closes open and locked project versions that are completed | |
|
|
308 | def close_completed_versions | |
|
|
309 | Version.transaction do | |
|
|
310 | versions.find(:all, :conditions => {:status => %w(open locked)}).each do |version| | |
|
|
311 | if version.completed? | |
|
|
312 | version.update_attribute(:status, 'closed') | |
|
|
313 | end | |
|
|
314 | end | |
|
|
315 | end | |
|
|
316 | end | |
|
|
317 | ||
|
|
307 | 318 | # Returns a hash of project users grouped by role |
|
|
308 | 319 | def users_by_role |
|
|
309 | 320 | members.find(:all, :include => [:user, :roles]).inject({}) do |h, m| |
| @@ -28,4 +28,10 | |||
|
|
28 | 28 | <p class="nodata"><%= l(:label_no_data) %></p> |
|
|
29 | 29 | <% end %> |
|
|
30 | 30 | |
|
|
31 | <div class="contextual"> | |
|
|
32 | <% if @project.versions.any? %> | |
|
|
33 | <%= link_to 'Close completed versions', {:controller => 'versions', :action => 'close_completed', :project_id => @project}, :method => :post %> | |
|
|
34 | <% end %> | |
|
|
35 | </div> | |
|
|
36 | ||
|
|
31 | 37 | <p><%= link_to_if_authorized l(:label_version_new), :controller => 'projects', :action => 'add_version', :id => @project %></p> |
| @@ -208,6 +208,12 ActionController::Routing::Routes.draw do |map| | |||
|
|
208 | 208 | end |
|
|
209 | 209 | end |
|
|
210 | 210 | |
|
|
211 | map.with_options :controller => 'versions' do |versions| | |
|
|
212 | versions.with_options :conditions => {:method => :post} do |version_actions| | |
|
|
213 | version_actions.connect 'projects/:project_id/versions/close_completed', :action => 'close_completed' | |
|
|
214 | end | |
|
|
215 | end | |
|
|
216 | ||
|
|
211 | 217 | map.with_options :controller => 'repositories' do |repositories| |
|
|
212 | 218 | repositories.with_options :conditions => {:method => :get} do |repository_views| |
|
|
213 | 219 | repository_views.connect 'projects/:id/repository', :action => 'show' |
| @@ -31,7 +31,7 Redmine::AccessControl.map do |map| | |||
|
|
31 | 31 | map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member |
|
|
32 | 32 | map.permission :select_project_modules, {:projects => :modules}, :require => :member |
|
|
33 | 33 | map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member |
|
|
34 | map.permission :manage_versions, {:projects => [:settings, :add_version], :versions => [:edit, :destroy]}, :require => :member | |
|
|
34 | map.permission :manage_versions, {:projects => [:settings, :add_version], :versions => [:edit, :close_completed, :destroy]}, :require => :member | |
|
|
35 | 35 | |
|
|
36 | 36 | map.project_module :issue_tracking do |map| |
|
|
37 | 37 | # Issue categories |
| @@ -47,6 +47,14 class VersionsControllerTest < ActionController::TestCase | |||
|
|
47 | 47 | assert_template 'edit' |
|
|
48 | 48 | end |
|
|
49 | 49 | |
|
|
50 | def test_close_completed | |
|
|
51 | Version.update_all("status = 'open'") | |
|
|
52 | @request.session[:user_id] = 2 | |
|
|
53 | post :close_completed, :project_id => 'ecookbook' | |
|
|
54 | assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook' | |
|
|
55 | assert_not_nil Version.find_by_status('closed') | |
|
|
56 | end | |
|
|
57 | ||
|
|
50 | 58 | def test_post_edit |
|
|
51 | 59 | @request.session[:user_id] = 2 |
|
|
52 | 60 | post :edit, :id => 2, |
| @@ -375,6 +375,17 class ProjectTest < ActiveSupport::TestCase | |||
|
|
375 | 375 | assert project.activities(true).include?(overridden_activity), "Inactive Project specific Activity not found" |
|
|
376 | 376 | end |
|
|
377 | 377 | |
|
|
378 | def test_close_completed_versions | |
|
|
379 | Version.update_all("status = 'open'") | |
|
|
380 | project = Project.find(1) | |
|
|
381 | assert_not_nil project.versions.detect {|v| v.completed? && v.status == 'open'} | |
|
|
382 | assert_not_nil project.versions.detect {|v| !v.completed? && v.status == 'open'} | |
|
|
383 | project.close_completed_versions | |
|
|
384 | project.reload | |
|
|
385 | assert_nil project.versions.detect {|v| v.completed? && v.status != 'closed'} | |
|
|
386 | assert_not_nil project.versions.detect {|v| !v.completed? && v.status == 'open'} | |
|
|
387 | end | |
|
|
388 | ||
|
|
378 | 389 | context "Project#copy" do |
|
|
379 | 390 | setup do |
|
|
380 | 391 | ProjectCustomField.destroy_all # Custom values are a mess to isolate in tests |
General Comments 0
You need to be logged in to leave comments.
Login now