Download as
Browse Code »

Commit bde19c061a73a7756cad4ba02e52187b1eb22fc5

Authored by Robert Speicher
1 parent a595f894
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update failure message for UsersProject uniqueness validation 

Was "User has already been taken", is now "User already exists in
project".
Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
app/models/users_project.rb
  Diff comments   View file @bde19c0
@@ -14,7 +14,7 @@ class UsersProject < ActiveRecord::Base @@ -14,7 +14,7 @@ class UsersProject < ActiveRecord::Base
14 after_save :update_repository 14 after_save :update_repository
15 after_destroy :update_repository 15 after_destroy :update_repository
16 16
17 - validates_uniqueness_of :user_id, scope: [:project_id] 17 + validates_uniqueness_of :user_id, scope: [:project_id], message: "already exists in project"
18 validates_presence_of :user_id 18 validates_presence_of :user_id
19 validates_presence_of :project_id 19 validates_presence_of :project_id
20 20
@@ -48,10 +48,10 @@ class UsersProject < ActiveRecord::Base @@ -48,10 +48,10 @@ class UsersProject < ActiveRecord::Base
48 48
49 def self.access_roles 49 def self.access_roles
50 { 50 {
51 - "Guest" => GUEST,  
52 - "Reporter" => REPORTER, 51 + "Guest" => GUEST,
  52 + "Reporter" => REPORTER,
53 "Developer" => DEVELOPER, 53 "Developer" => DEVELOPER,
54 - "Master" => MASTER 54 + "Master" => MASTER
55 } 55 }
56 end 56 end
57 57