Additional fix for CO-1803

COmanage · Nov 2, 2019 · 746afc3 · 746afc3
1 parent f303cad
commit 746afc3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/app/src/Model/Table/MatchgridSettingsTable.php b/app/src/Model/Table/MatchgridSettingsTable.php
@@ -210,6 +210,18 @@ public function validationDefault(Validator $validator) {
     );
     $validator->allowEmpty('referenceid_prefix');
 
+    $validator->add(
+      'notification_email',
+      'length',
+      [ 'rule' => [ 'maxLength', 80 ] ]
+    );
+    $validator->add(
+      'notification_email',
+      'content',
+      [ 'rule' => 'email' ]
+    );
+    $validator->allowEmpty('notification_email');
+
     return $validator; 
   }
 }
diff --git a/app/src/Template/MatchgridSettings/fields.inc b/app/src/Template/MatchgridSettings/fields.inc
@@ -58,9 +58,7 @@ if($action == 'edit') {
   print $this->Field->control('referenceid_start',
                               ['default' => 1001]);
 
-  print $this->Field->control('referenceid_prefix',
-                              [],
-                              false);
+  print $this->Field->control('referenceid_prefix', [], false);
 
-  print $this->Field->control('notification_email', [], true);
+  print $this->Field->control('notification_email', [], false);
 }
diff --git a/app/src/Template/SystemsOfRecord/fields.inc b/app/src/Template/SystemsOfRecord/fields.inc
@@ -55,5 +55,5 @@ if($action == 'add' || $action == 'edit') {
                               ['empty' => true,
                                'onChange' => 'fields_update_gadgets();']);
 
-  print $this->Field->control('notification_email', [], true);
+  print $this->Field->control('notification_email', [], false);
 }