Properly trigger validation for unique client-id or provider-id. #54

datacite · Nov 14, 2018 · 672ca1d · 672ca1d
1 parent 5b75761
commit 672ca1d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/validators/unique-client-id.js b/app/validators/unique-client-id.js
@@ -6,12 +6,12 @@ const UniqueClientId = BaseValidator.extend({
 
   validate(value, options, model) {
     let providerId = model.get('provider').get('symbol') + '.';
-    if (value === providerId || Ember.computed.not('model.meta.id.isEnabled')) {
+    if (value === providerId) {
       return true;
     } else {
-      return this.get('store').query('client', { query: value, 'include-deleted': true }).then((result) => {
+      return this.get('store').query('client', { id: value }).then((result) => {
         if(result.content.length > 0) {
-          return "The Client ID " + value + " already exists, or existed before and has been deleted. Please contact DataCite staff if you want to create an account with this Client ID.";
+          return "The Client ID " + value + " already exists, or existed before and has been deleted. Contact DataCite staff if you want to create an account with this Client ID.";
         } else {
           return true;
         }

diff --git a/app/validators/unique-provider-id.js b/app/validators/unique-provider-id.js
@@ -5,12 +5,12 @@ const UniqueProviderId = BaseValidator.extend({
   store: Ember.inject.service(),
 
   validate(value, options, model) {
-    if (value.length < 2 || model && Ember.computed.not('model.meta.id.isEnabled')) {
+    if (value.length < 2) {
       return true;
     } else {
-      return this.get('store').query('provider', { query: value, 'include-deleted': true }).then((result) => {
+      return this.get('store').query('provider', { id: value }).then((result) => {
         if(result.content.length > 0) {
-          return "The Provider ID " + value + " already exists, or existed before and has been deleted. Please contact DataCite staff if you want to create an account with this Provider ID.";
+          return "The Provider ID " + value + " already exists, or existed before and has been deleted. Contact DataCite staff if you want to create an account with this Provider ID.";
         } else {
           return true;
         }