jro_apps/redmine Commit - r9904:9b4d29dc0d0c

Do not propose non-assignable version (#11506)....

Jean-Philippe Lang -

r9904:9b4d29dc0d0c

parent child

Context file:

r9904:9b4d29dc0d0c

Collapse all files

app/helpers/projects_helper.rb 0 -4

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2012  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.
             module ProjectsHelper
               def link_to_version(version, options = {})
                 return '' unless version && version.is_a?(Version)
                 link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, options
               end
               def project_settings_tabs
                 tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
                         {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},
                         {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural},
                         {:name => 'versions', :action => :manage_versions, :partial => 'projects/settings/versions', :label => :label_version_plural},
                         {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural},
                         {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki},
                         {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural},
                         {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural},
                         {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :enumeration_activities}
                         ]
                 tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
               end
               def parent_project_select_tag(project)
                 selected = project.parent
                 # retrieve the requested parent project
                 parent_id = (params[:project] && params[:project][:parent_id]) || params[:parent_id]
                 if parent_id
                   selected = (parent_id.blank? ? nil : Project.find(parent_id))
                 end
                 options = ''
                 options << "<option value=''></option>" if project.allowed_parents.include?(nil)
                 options << project_tree_options_for_select(project.allowed_parents.compact, :selected => selected)
                 content_tag('select', options.html_safe, :name => 'project[parent_id]', :id => 'project_parent_id')
               end
               # Renders a tree of projects as a nested set of unordered lists
               # The given collection may be a subset of the whole project tree
               # (eg. some intermediate nodes are private and can not be seen)
               def render_project_hierarchy(projects)
                 s = ''
                 if projects.any?
                   ancestors = []
                   original_project = @project
                   projects.each do |project|
                     # set the project environment to please macros.
                     @project = project
                     if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
                       s << "<ul class='projects #{ ancestors.empty? ? 'root' : nil}'>\n"
                     else
                       ancestors.pop
                       s << "</li>"
                       while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                         ancestors.pop
                         s << "</ul></li>\n"
                       end
                     end
                     classes = (ancestors.empty? ? 'root' : 'child')
                     s << "<li class='#{classes}'><div class='#{classes}'>" +
                            link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")
                     s << "<div class='wiki description'>#{textilizable(project.short_description, :project => project)}</div>" unless project.description.blank?
                     s << "</div>\n"
                     ancestors << project
                   end
                   s << ("</li></ul>\n" * ancestors.size)
                   @project = original_project
                 end
                 s.html_safe
               end
               # Returns a set of options for a select field, grouped by project.
               def version_options_for_select(versions, selected=nil)
                 grouped = Hash.new {|h,k| h[k] = []}
                 versions.each do |version|
                   grouped[version.project.name] << [version.name, version.id]
                 end
-                # Add in the selected
-                if selected && !versions.include?(selected)
-                  grouped[selected.project.name] << [selected.name, selected.id]
-                end
                 if grouped.keys.size > 1
                   grouped_options_for_select(grouped, selected && selected.id)
                 else
                   options_for_select((grouped.values.first || []), selected && selected.id)
                 end
               end
               def format_version_sharing(sharing)
                 sharing = 'none' unless Version::VERSION_SHARINGS.include?(sharing)
                 l("label_version_sharing_#{sharing}")
               end
             end

test/functional/versions_controller_test.rb +1 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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.expand_path('../../test_helper', __FILE__)
             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, :issue_statuses
               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("contextMenuInit('/issues/context_menu')"))
                 # Links to versions anchors
                 assert_tag 'a', :attributes => {:href => '#2.0'},
                                 :ancestor => {:tag => 'div', :attributes => {:id => 'sidebar'}}
                 # Links to completed versions in the sidebar
                 assert_tag 'a', :attributes => {:href => '/versions/1'},
                                 :ancestor => {:tag => 'div', :attributes => {:id => 'sidebar'}}
               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_with_tracker_ids
                 get :index, :project_id => 1, :tracker_ids => [1, 3]
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:issues_by_version)
                 assert_nil assigns(:issues_by_version).values.flatten.detect {|issue| issue.tracker_id == 2}
               end
               def test_index_showing_subprojects_versions
                 @subproject_version = Version.create!(:project => Project.find(3), :name => "Subproject version")
                 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_new
                 @request.session[:user_id] = 2
                 get :new, :project_id => '1'
                 assert_response :success
                 assert_template 'new'
               end
               def test_new_from_issue_form
                 @request.session[:user_id] = 2
                 xhr :get, :new, :project_id => '1'
                 assert_response :success
                 assert_template 'new'
                 assert_equal 'text/javascript', response.content_type
               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
                 assert_difference 'Version.count' do
                   xhr :post, :create, :project_id => '1', :version => {:name => 'test_add_version_from_issue_form'}
                 end
                 version = Version.find_by_name('test_add_version_from_issue_form')
                 assert_not_nil version
                 assert_equal 1, version.project_id
                 assert_response :success
                 assert_template 'create'
                 assert_equal 'text/javascript', response.content_type
+                assert_include 'test_add_version_from_issue_form', response.body
               end
               def test_create_from_issue_form_with_failure
                 @request.session[:user_id] = 2
                 assert_no_difference 'Version.count' do
                   xhr :post, :create, :project_id => '1', :version => {:name => ''}
                 end
                 assert_response :success
                 assert_template 'new'
                 assert_equal 'text/javascript', response.content_type
               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
                 put :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
                 put :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
                 assert_difference 'Version.count', -1 do
                   delete :destroy, :id => 3
                 end
                 assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
                 assert_nil Version.find_by_id(3)
               end
               def test_destroy_version_in_use_should_fail
                 @request.session[:user_id] = 2
                 assert_no_difference 'Version.count' do
                   delete :destroy, :id => 2
                 end
                 assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
                 assert flash[:error].match(/Unable to delete version/)
                 assert Version.find_by_id(2)
               end
               def test_issue_status_by
                 xhr :get, :status_by, :id => 2
                 assert_response :success
                 assert_template 'status_by'
                 assert_template '_issue_counts'
               end
               def test_issue_status_by_status
                 xhr :get, :status_by, :id => 2, :status_by => 'status'
                 assert_response :success
                 assert_template 'status_by'
                 assert_template '_issue_counts'
                 assert_include 'Assigned', response.body
                 assert_include 'Closed', response.body
               end
             end

test/unit/helpers/projects_helper_test.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2012  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.expand_path('../../../test_helper', __FILE__)
             class ProjectsHelperTest < ActionView::TestCase
               include ApplicationHelper
               include ProjectsHelper
               include ERB::Util
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :versions,
                        :projects_trackers,
                        :member_roles,
                        :members,
                        :groups_users,
                        :enabled_modules,
                        :workflows
               def setup
                 super
                 set_language_if_valid('en')
                 User.current = nil
               end
               def test_link_to_version_within_project
                 @project = Project.find(2)
                 User.current = User.find(1)
                 assert_equal '<a href="/versions/5">Alpha</a>', link_to_version(Version.find(5))
               end
               def test_link_to_version
                 User.current = User.find(1)
                 assert_equal '<a href="/versions/5">OnlineStore - Alpha</a>', link_to_version(Version.find(5))
               end
               def test_link_to_private_version
                 assert_equal 'OnlineStore - Alpha', link_to_version(Version.find(5))
               end
               def test_link_to_version_invalid_version
                 assert_equal '', link_to_version(Object)
               end
               def test_format_version_name_within_project
                 @project = Project.find(1)
                 assert_equal "0.1", format_version_name(Version.find(1))
               end
               def test_format_version_name
                 assert_equal "eCookbook - 0.1", format_version_name(Version.find(1))
               end
               def test_format_version_name_for_system_version
                 assert_equal "OnlineStore - Systemwide visible version", format_version_name(Version.find(7))
               end
               def test_version_options_for_select_with_no_versions
                 assert_equal '', version_options_for_select([])
-                assert_equal '<option value="1" selected="selected">0.1</option>', version_options_for_select([], Version.find(1))
+                assert_equal '', version_options_for_select([], Version.find(1))
               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