jro_apps/redmine Commit - r2909:8f40750ad7f7

Adds a link to automatically close completed versions in project settings (#1245)....

Jean-Philippe Lang -

r2909:8f40750ad7f7

parent child

Context file:

r2909:8f40750ad7f7

app/controllers/versions_controller.rb +18 -3

             class VersionsController < ApplicationController
               menu_item :roadmap
-              before_filter :find_project, :authorize
+              before_filter :find_version, :except => :close_completed
+              before_filter :find_project, :only => :close_completed
+              before_filter :authorize
               def show
               end
                   redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                 end
               end
+              def close_completed
+                if request.post?
+                  @project.close_completed_versions
+                end
+                redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+              end
               def destroy
                 @version.destroy
               end
             private
-              def find_project
+              def find_version
                 @version = Version.find(params[:id])
                 @project = @version.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
+              def find_project
+                @project = Project.find(params[:project_id])
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
             end

app/models/project.rb +11 0

@@ -304,6 +304,17 class Project < ActiveRecord::Base
304	:order => "#{Tracker.table_name}.position")	304	:order => "#{Tracker.table_name}.position")
305	end	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	# Returns a hash of project users grouped by role	318	# Returns a hash of project users grouped by role
308	def users_by_role	319	def users_by_role
309	members.find(:all, :include => [:user, :roles]).inject({}) do \|h, m\|	320	members.find(:all, :include => [:user, :roles]).inject({}) do \|h, m\|

app/views/projects/settings/_versions.rhtml +6 0

@@ -28,4 +28,10
28	<p class="nodata"><%= l(:label_no_data) %></p>	28	<p class="nodata"><%= l(:label_no_data) %></p>
29	<% end %>	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	<p><%= link_to_if_authorized l(:label_version_new), :controller => 'projects', :action => 'add_version', :id => @project %></p>	37	<p><%= link_to_if_authorized l(:label_version_new), :controller => 'projects', :action => 'add_version', :id => @project %></p>

config/routes.rb +6 0

                 end
               end
+              map.with_options :controller => 'versions' do |versions|
+                versions.with_options :conditions => {:method => :post} do |version_actions|
+                  version_actions.connect 'projects/:project_id/versions/close_completed', :action => 'close_completed'
+                end
+              end
               map.with_options :controller => 'repositories' do |repositories|
                 repositories.with_options :conditions => {:method => :get} do |repository_views|
                   repository_views.connect 'projects/:id/repository', :action => 'show'

lib/redmine.rb +1 -1

               map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member
-              map.permission :manage_versions, {:projects => [:settings, :add_version], :versions => [:edit, :destroy]}, :require => :member
+              map.permission :manage_versions, {:projects => [:settings, :add_version], :versions => [:edit, :close_completed, :destroy]}, :require => :member
               map.project_module :issue_tracking do |map|
                 # Issue categories

test/functional/versions_controller_test.rb +8 0

                 assert_template 'edit'
               end
+              def test_close_completed
+                Version.update_all("status = 'open'")
+                @request.session[:user_id] = 2
+                post :close_completed, :project_id => 'ecookbook'
+                assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
+                assert_not_nil Version.find_by_status('closed')
+              end
               def test_post_edit
                 @request.session[:user_id] = 2
                 post :edit, :id => 2,

test/unit/project_test.rb +11 0

@@ -374,6 +374,17 class ProjectTest < ActiveSupport::TestCase
374		374
375	assert project.activities(true).include?(overridden_activity), "Inactive Project specific Activity not found"	375	assert project.activities(true).include?(overridden_activity), "Inactive Project specific Activity not found"
376	end	376	end
		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
377		388
378	context "Project#copy" do	389	context "Project#copy" do
379	setup do	390	setup do

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages