@@ -524,7 +524,7 module ApplicationHelper | |||||
524 | esc, all, page, title = $1, $2, $3, $5 |
|
524 | esc, all, page, title = $1, $2, $3, $5 | |
525 | if esc.nil? |
|
525 | if esc.nil? | |
526 | if page =~ /^([^\:]+)\:(.*)$/ |
|
526 | if page =~ /^([^\:]+)\:(.*)$/ | |
527 |
link_project = Project.find_by_ |
|
527 | link_project = Project.find_by_identifier($1) || Project.find_by_name($1) | |
528 | page = $2 |
|
528 | page = $2 | |
529 | title ||= $1 if page.blank? |
|
529 | title ||= $1 if page.blank? | |
530 | end |
|
530 | end |
@@ -64,7 +64,7 class Project < ActiveRecord::Base | |||||
64 | attr_protected :status, :enabled_module_names |
|
64 | attr_protected :status, :enabled_module_names | |
65 |
|
65 | |||
66 | validates_presence_of :name, :identifier |
|
66 | validates_presence_of :name, :identifier | |
67 |
validates_uniqueness_of |
|
67 | validates_uniqueness_of :identifier | |
68 | validates_associated :repository, :wiki |
|
68 | validates_associated :repository, :wiki | |
69 | validates_length_of :name, :maximum => 30 |
|
69 | validates_length_of :name, :maximum => 30 | |
70 | validates_length_of :homepage, :maximum => 255 |
|
70 | validates_length_of :homepage, :maximum => 255 |
@@ -29,7 +29,6 class ProjectTest < ActiveSupport::TestCase | |||||
29 | should_validate_presence_of :name |
|
29 | should_validate_presence_of :name | |
30 | should_validate_presence_of :identifier |
|
30 | should_validate_presence_of :identifier | |
31 |
|
31 | |||
32 | should_validate_uniqueness_of :name |
|
|||
33 | should_validate_uniqueness_of :identifier |
|
32 | should_validate_uniqueness_of :identifier | |
34 |
|
33 | |||
35 | context "associations" do |
|
34 | context "associations" do |
General Comments 0
You need to be logged in to leave comments.
Login now