jro_apps/redmine Commit - r994:524cd689cf87

Project identifier is now used in URLs (instead of project id)....

Jean-Philippe Lang -

r994:524cd689cf87

parent child

Context file:

r994:524cd689cf87

Collapse all files

app/models/project.rb +14 0

@@ -111,6 +111,20 class Project < ActiveRecord::Base
111	end	111	end
112	end	112	end
113		113
		114	def self.find(*args)
		115	if args.first && args.first.is_a?(String) && !args.first.match(/^\d*$/)
		116	project = find_by_identifier(*args)
		117	raise ActiveRecord::RecordNotFound, "Couldn't find Project with identifier=#{args.first}" if project.nil?
		118	project
		119	else
		120	super
		121	end
		122	end
		123
		124	def to_param
		125	identifier
		126	end
		127
114	def active?	128	def active?
115	self.status == STATUS_ACTIVE	129	self.status == STATUS_ACTIVE
116	end	130	end

test/fixtures/projects.yml +1 -1

               description: eCookbook Subproject 2
               homepage: ""
               is_public: true
-              identifier: subproject1
+              identifier: subproject2
               parent_id: 1

test/functional/issues_controller_test.rb +1 -1

               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 1
-                assert_redirected_to 'projects/1/issues'
+                assert_redirected_to 'projects/ecookbook/issues'
                 assert_nil Issue.find_by_id(1)
               end

test/functional/projects_controller_test.rb +13 -5

                 assert assigns(:project_tree)[Project.find(1)].include?(Project.find(3))
               end
-              def test_show
+              def test_show_by_id
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
               end
+              def test_show_by_identifier
+                get :show, :id => 'ecookbook'
+                assert_response :success
+                assert_template 'show'
+                assert_not_nil assigns(:project)
+                assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
+              end
               def test_settings
                 @request.session[:user_id] = 2 # manager
               def test_edit
                 @request.session[:user_id] = 2 # manager
                 post :edit, :id => 1, :project => {:name => 'Test changed name'}
-                assert_redirected_to 'projects/settings/1'
+                assert_redirected_to 'projects/settings/ecookbook'
                 project = Project.find(1)
                 assert_equal 'Test changed name', project.name
               end
               def test_move_issues_to_another_project
                 @request.session[:user_id] = 1
                 post :move_issues, :id => 1, :issue_ids => [1, 2], :new_project_id => 2
-                assert_redirected_to 'projects/1/issues'
+                assert_redirected_to 'projects/ecookbook/issues'
                 assert_equal 2, Issue.find(1).project_id
                 assert_equal 2, Issue.find(2).project_id
               end
               def test_move_issues_to_another_tracker
                 @request.session[:user_id] = 1
                 post :move_issues, :id => 1, :issue_ids => [1, 2], :new_tracker_id => 3
-                assert_redirected_to 'projects/1/issues'
+                assert_redirected_to 'projects/ecookbook/issues'
                 assert_equal 3, Issue.find(1).tracker_id
                 assert_equal 3, Issue.find(2).tracker_id
               end
                 assert_response :success
                 assert_template 'add_issue'
                 post :add_issue, :id => 1, :issue => {:tracker_id => 1, :subject => 'This is the test_add_issue issue', :description => 'This is the description', :priority_id => 5}
-                assert_redirected_to 'projects/1/issues'
+                assert_redirected_to 'projects/ecookbook/issues'
                 assert Issue.find_by_subject('This is the test_add_issue issue')
               end

test/functional/repositories_controller_test.rb +2 -2

                 assert_response :success
                 assert_template 'revision'
                 assert_no_tag :tag => "div", :attributes => { :class => "contextual" },
-                  :child => { :tag => "a", :attributes => { :href => '/repositories/revision/1?rev=0'}
+                  :child => { :tag => "a", :attributes => { :href => '/repositories/revision/ecookbook?rev=0'}
                 }
                 assert_tag :tag => "div", :attributes => { :class => "contextual" },
-                    :child => { :tag => "a", :attributes => { :href => '/repositories/revision/1?rev=2'}
+                    :child => { :tag => "a", :attributes => { :href => '/repositories/revision/ecookbook?rev=2'}
                 }
               end

test/functional/versions_controller_test.rb +2 -2

                 post :edit, :id => 2,
                             :version => { :name => 'New version name',
                                           :effective_date => Date.today.strftime("%Y-%m-%d")}
-                assert_redirected_to 'projects/settings/1'
+                assert_redirected_to 'projects/settings/ecookbook'
                 version = Version.find(2)
                 assert_equal 'New version name', version.name
                 assert_equal Date.today, version.effective_date
               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 2
-                assert_redirected_to 'projects/settings/1'
+                assert_redirected_to 'projects/settings/ecookbook'
                 assert_nil Version.find_by_id(2)
               end

test/functional/wiki_controller_test.rb +6 -6

                             :content => {:comments => 'Created the page',
                                          :text => "h1. New page\n\nThis is a new page",
                                          :version => 0}
-                assert_redirected_to 'wiki/1/New_page'
+                assert_redirected_to 'wiki/ecookbook/New_page'
                 page = Project.find(1).wiki.find_page('New page')
                 assert !page.new_record?
                 assert_not_nil page.content
                 post :rename, :id => 1, :page => 'Another_page',
                                         :wiki_page => { :title => 'Another renamed page',
                                                         :redirect_existing_links => 1 }
-                assert_redirected_to 'wiki/1/Another_renamed_page'
+                assert_redirected_to 'wiki/ecookbook/Another_renamed_page'
                 wiki = Project.find(1).wiki
                 # Check redirects
                 assert_not_nil wiki.find_page('Another page')
                 post :rename, :id => 1, :page => 'Another_page',
                                         :wiki_page => { :title => 'Another renamed page',
                                                         :redirect_existing_links => "0" }
-                assert_redirected_to 'wiki/1/Another_renamed_page'
+                assert_redirected_to 'wiki/ecookbook/Another_renamed_page'
                 wiki = Project.find(1).wiki
                 # Check that there's no redirects
                 assert_nil wiki.find_page('Another page')
               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 1, :page => 'CookBook_documentation'
-                assert_redirected_to 'wiki/1/Page_index/special'
+                assert_redirected_to 'wiki/ecookbook/Page_index/special'
               end
               def test_page_index
-                get :special, :id => 1, :page => 'Page_index'
+                get :special, :id => 'ecookbook', :page => 'Page_index'
                 assert_response :success
                 assert_template 'special_page_index'
                 pages = assigns(:pages)
                 assert_not_nil pages
                 assert_equal 2, pages.size
-                assert_tag :tag => 'a', :attributes => { :href => '/wiki/1/CookBook_documentation' },
+                assert_tag :tag => 'a', :attributes => { :href => '/wiki/ecookbook/CookBook_documentation' },
                                         :content => /CookBook documentation/
               end

test/functional/wikis_controller_test.rb +1 -1

               def test_destroy
                 @request.session[:user_id] = 1
                 post :destroy, :id => 1, :confirm => 1
-                assert_redirected_to 'projects/settings/1'
+                assert_redirected_to 'projects/settings/ecookbook'
                 assert_nil Project.find(1).wiki
               end

test/integration/issues_test.rb +1 -1

                 assert_kind_of Issue, issue
                 # check redirection
-                assert_redirected_to "projects/1/issues"
+                assert_redirected_to "projects/ecookbook/issues"
                 follow_redirect!
                 assert assigns(:issues).include?(issue)

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