Allow non-unique names for projects (#630).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4391 e93f8b46-1217-0410-a6f0-8f06a7374b81

Allow non-unique names for projects (#630).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4391 e93f8b46-1217-0410-a6f0-8f06a7374b81
fa3d71be · Jean-Philippe Lang · 7482d2f5 · fa3d71be · fa3d71be · fa3d71be
Commit fa3d71be authored Nov 11, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

application_helper.rb app/helpers/application_helper.rb +1 -1

project.rb app/models/project.rb +1 -1

project_test.rb test/unit/project_test.rb +0 -1

No files found.
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -524,7 +524,7 @@ module ApplicationHelper
      esc, all, page, title = $1, $2, $3, $5
      if esc.nil?
        if page =~ /^([^\:]+)\:(.*)$/
-          link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
+          link_project = Project.find_by_identifier($1) || Project.find_by_name($1)
          page = $2
          title ||= $1 if page.blank?
        end

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -64,7 +64,7 @@ class Project < ActiveRecord::Base
  attr_protected :status, :enabled_module_names
  
  validates_presence_of :name, :identifier
-  validates_uniqueness_of :name, :identifier
+  validates_uniqueness_of :identifier
  validates_associated :repository, :wiki
  validates_length_of :name, :maximum => 30
  validates_length_of :homepage, :maximum => 255

--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -29,7 +29,6 @@ class ProjectTest < ActiveSupport::TestCase
  should_validate_presence_of :name
  should_validate_presence_of :identifier

-  should_validate_uniqueness_of :name
  should_validate_uniqueness_of :identifier

  context "associations" do