From bde19c061a73a7756cad4ba02e52187b1eb22fc5 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 6 Sep 2012 16:51:28 -0400
Subject: [PATCH] Update failure message for UsersProject uniqueness validation
Was "User has already been taken", is now "User already exists in
project".
---
app/models/users_project.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/models/users_project.rb b/app/models/users_project.rb
index 7d1729343bb..1b5984834e4 100644
--- a/app/models/users_project.rb
+++ b/app/models/users_project.rb
@@ -14,7 +14,7 @@ class UsersProject < ActiveRecord::Base
after_save :update_repository
after_destroy :update_repository
- validates_uniqueness_of :user_id, scope: [:project_id]
+ validates_uniqueness_of :user_id, scope: [:project_id], message: "already exists in project"
validates_presence_of :user_id
validates_presence_of :project_id
@@ -48,10 +48,10 @@ class UsersProject < ActiveRecord::Base
def self.access_roles
{
- "Guest" => GUEST,
- "Reporter" => REPORTER,
+ "Guest" => GUEST,
+ "Reporter" => REPORTER,
"Developer" => DEVELOPER,
- "Master" => MASTER
+ "Master" => MASTER
}
end
--
GitLab