COmanage Developers List

Author: benno
Date: 2013-02-23 09:33:41 -0500 (Sat, 23 Feb 2013)
New Revision: 460

Modified:
   registry/trunk/app/Model/Address.php
   registry/trunk/app/Model/Co.php
   registry/trunk/app/View/Addresses/fields.inc
Log:
Fix validation rules for Co and Address models (CO-544)

Modified: registry/trunk/app/Model/Address.php
===================================================================
--- registry/trunk/app/Model/Address.php        2013-02-12 01:56:53 UTC (rev 
459)
+++ registry/trunk/app/Model/Address.php        2013-02-23 14:33:41 UTC (rev 
460)
@@ -53,23 +53,28 @@
     ),
     'line2' => array(
       'rule' => array('maxLength', 128),
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'locality' => array(
       'rule' => array('maxLength', 128),
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'state' => array(
       'rule' => array('maxLength', 128),
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'postal_code' => array(
       'rule' => array('maxLength', 16),
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'country' => array(
       'rule' => array('maxLength', 128),
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'type' => array(
       'rule' => array('inList', array(ContactEnum::Home,

Modified: registry/trunk/app/Model/Co.php
===================================================================
--- registry/trunk/app/Model/Co.php     2013-02-12 01:56:53 UTC (rev 459)
+++ registry/trunk/app/Model/Co.php     2013-02-23 14:33:41 UTC (rev 460)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry CO Model
  *
- * Copyright (C) 2010-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2010-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2010-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2010-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.1
@@ -68,7 +68,8 @@
     ),
     'description' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'status' => array(
       'rule' => array('inList', array('A', 'S')),

Modified: registry/trunk/app/View/Addresses/fields.inc
===================================================================
--- registry/trunk/app/View/Addresses/fields.inc        2013-02-12 01:56:53 
UTC (rev 459)
+++ registry/trunk/app/View/Addresses/fields.inc        2013-02-23 14:33:41 
UTC (rev 460)
@@ -60,7 +60,7 @@
   <tbody>
     <tr class="line1">
       <td>
-        <?php echo _txt('fd.address.line1'); ?>
+        <?php echo _txt('fd.address.line1'); ?><font 
class="required">*</font>
       </td>
       <td>
         <?php echo ($e ? $this->Form->input('line1') : 
Sanitize::html($addresses[0]['Address']['line1'])); ?>