jro_apps/redmine Commit - r4241:f1f0704ef82f

Merged r4354 from trunk....

Jean-Philippe Lang -

r4241:f1f0704ef82f

parent child

Context file:

r4241:f1f0704ef82f

Collapse all files

app/controllers/versions_controller.rb +4 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class VersionsController < ApplicationController
               menu_item :roadmap
               model_object Version
               before_filter :find_model_object, :except => [:index, :new, :create, :close_completed]
               before_filter :find_project_from_association, :except => [:index, :new, :create, :close_completed]
               before_filter :find_project, :only => [:index, :new, :create, :close_completed]
               before_filter :authorize
               helper :custom_fields
               helper :projects
               def index
                 @trackers = @project.trackers.find(:all, :order => 'position')
                 retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?})
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
                 @versions = @project.shared_versions || []
                 @versions += @project.rolled_up_versions.visible if @with_subprojects
                 @versions = @versions.uniq.sort
                 @versions.reject! {|version| version.closed? || version.completed? } unless params[:completed]
                 @issues_by_version = {}
                 unless @selected_tracker_ids.empty?
                   @versions.each do |version|
                     issues = version.fixed_issues.visible.find(:all,
                                                                :include => [:project, :status, :tracker, :priority],
                                                                :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids},
                                                                :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id")
                     @issues_by_version[version] = issues
                   end
                 end
                 @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?}
               end
               def show
                 @issues = @version.fixed_issues.visible.find(:all,
                   :include => [:status, :tracker, :priority],
                   :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id")
               end
               def new
                 @version = @project.versions.build
                 if params[:version]
                   attributes = params[:version].dup
                   attributes.delete('sharing') unless attributes.nil? || @version.allowed_sharings.include?(attributes['sharing'])
                   @version.attributes = attributes
                 end
               end
               def create
                 # TODO: refactor with code above in #new
                 @version = @project.versions.build
                 if params[:version]
                   attributes = params[:version].dup
                   attributes.delete('sharing') unless attributes.nil? || @version.allowed_sharings.include?(attributes['sharing'])
                   @version.attributes = attributes
                 end
                 if request.post?
                   if @version.save
                     respond_to do |format|
                       format.html do
                         flash[:notice] = l(:notice_successful_create)
                         redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                       end
                       format.js do
                         # IE doesn't support the replace_html rjs method for select box options
                         render(:update) {|page| page.replace "issue_fixed_version_id",
                           content_tag('select', '<option></option>' + version_options_for_select(@project.shared_versions.open, @version), :id => 'issue_fixed_version_id', :name => 'issue[fixed_version_id]')
                         }
                       end
                     end
                   else
                     respond_to do |format|
                       format.html { render :action => 'new' }
                       format.js do
                         render(:update) {|page| page.alert(@version.errors.full_messages.join('\n')) }
                       end
                     end
                   end
                 end
               end
               def edit
               end
               def update
                 if request.post? && params[:version]
                   attributes = params[:version].dup
                   attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing'])
                   if @version.update_attributes(attributes)
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+                  else
+                    respond_to do |format|
+                      format.html { render :action => 'edit' }
+                    end
                   end
                 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
                 if @version.fixed_issues.empty?
                   @version.destroy
                   redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                 else
                   flash[:error] = l(:notice_unable_delete_version)
                   redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                 end
               end
               def status_by
                 respond_to do |format|
                   format.html { render :action => 'show' }
                   format.js { render(:update) {|page| page.replace_html 'status_by', render_issue_status_by(@version, params[:status_by])} }
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers, default_trackers=nil)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                 else
                   @selected_tracker_ids = (default_trackers || selectable_trackers).collect {|t| t.id.to_s }
                 end
               end
             end

test/functional/versions_controller_test.rb +9 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'versions_controller'
             # Re-raise errors caught by the controller.
             class VersionsController; def rescue_action(e) raise e end; end
             class VersionsControllerTest < ActionController::TestCase
               fixtures :projects, :versions, :issues, :users, :roles, :members, :member_roles, :enabled_modules
               def setup
                 @controller = VersionsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_index
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version doesn't appear
                 assert !assigns(:versions).include?(Version.find(1))
                 # Context menu on issues
                 assert_select "script", :text => Regexp.new(Regexp.escape("new ContextMenu('/issues/context_menu')"))
               end
               def test_index_with_completed_versions
                 get :index, :project_id => 1, :completed => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version appears
                 assert assigns(:versions).include?(Version.find(1))
               end
               def test_index_showing_subprojects_versions
                 @subproject_version = Version.generate!(:project => Project.find(3))
                 get :index, :project_id => 1, :with_subprojects => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:versions)
                 assert assigns(:versions).include?(Version.find(4)), "Shared version not found"
                 assert assigns(:versions).include?(@subproject_version), "Subproject version not found"
               end
               def test_show
                 get :show, :id => 2
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:version)
                 assert_tag :tag => 'h2', :content => /1.0/
               end
               def test_create
                 @request.session[:user_id] = 2 # manager
                 assert_difference 'Version.count' do
                   post :create, :project_id => '1', :version => {:name => 'test_add_version'}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/versions'
                 version = Version.find_by_name('test_add_version')
                 assert_not_nil version
                 assert_equal 1, version.project_id
               end
               def test_create_from_issue_form
                 @request.session[:user_id] = 2 # manager
                 assert_difference 'Version.count' do
                   xhr :post, :create, :project_id => '1', :version => {:name => 'test_add_version_from_issue_form'}
                 end
                 assert_response :success
                 assert_select_rjs :replace, 'issue_fixed_version_id'
                 version = Version.find_by_name('test_add_version_from_issue_form')
                 assert_not_nil version
                 assert_equal 1, version.project_id
               end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :id => 2
                 assert_response :success
                 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_update
                 @request.session[:user_id] = 2
                 post :update, :id => 2,
                             :version => { :name => 'New version name',
                                           :effective_date => Date.today.strftime("%Y-%m-%d")}
                 assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
                 version = Version.find(2)
                 assert_equal 'New version name', version.name
                 assert_equal Date.today, version.effective_date
               end
+              def test_post_update_with_validation_failure
+                @request.session[:user_id] = 2
+                put :update, :id => 2,
+                             :version => { :name => '',
+                                           :effective_date => Date.today.strftime("%Y-%m-%d")}
+                assert_response :success
+                assert_template 'edit'
+              end
               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 3
                 assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
                 assert_nil Version.find_by_id(3)
               end
               def test_issue_status_by
                 xhr :get, :status_by, :id => 2
                 assert_response :success
                 assert_template '_issue_counts'
               end
             end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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