COmanage Developers List

Author: benno
Date: 2013-02-25 21:43:41 -0500 (Mon, 25 Feb 2013)
New Revision: 469

Modified:
   registry/trunk/app/Model/CmpEnrollmentAttribute.php
   registry/trunk/app/Model/CoEnrollmentAttribute.php
   registry/trunk/app/Model/CoEnrollmentFlow.php
   registry/trunk/app/Model/CoGroup.php
   registry/trunk/app/Model/CoIdentifierAssignment.php
   registry/trunk/app/Model/CoInvite.php
   registry/trunk/app/Model/CoNsfDemographic.php
   registry/trunk/app/Model/CoProvisioningTarget.php
   registry/trunk/app/Model/Cou.php
   registry/trunk/app/Model/EmailAddress.php
   registry/trunk/app/Model/Identifier.php
   registry/trunk/app/Model/Name.php
   registry/trunk/app/Model/OrgIdentity.php
   registry/trunk/app/Model/Organization.php
Log:
Fix allowEmpty field validations (CO-544)

Modified: registry/trunk/app/Model/CmpEnrollmentAttribute.php
===================================================================
--- registry/trunk/app/Model/CmpEnrollmentAttribute.php 2013-02-25 23:45:58 
UTC (rev 468)
+++ registry/trunk/app/Model/CmpEnrollmentAttribute.php 2013-02-26 02:43:41 
UTC (rev 469)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry CMP Enrollment Attribute Model
  *
- * Copyright (C) 2011-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2011-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) 2011-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2011-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.3
@@ -47,18 +47,21 @@
     ),
     'type' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'required' => array(
       'rule' => array('range', -2, 2)
     ),
     'ldap_name' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'saml_name' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
   );
 }

Modified: registry/trunk/app/Model/CoEnrollmentAttribute.php
===================================================================
--- registry/trunk/app/Model/CoEnrollmentAttribute.php  2013-02-25 23:45:58 
UTC (rev 468)
+++ registry/trunk/app/Model/CoEnrollmentAttribute.php  2013-02-26 02:43:41 
UTC (rev 469)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry CO Enrollment Attribute Model
  *
- * Copyright (C) 2011-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2011-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
@@ -60,11 +60,13 @@
     ),
     'ordr' => array(
       'rule' => 'numeric',
+      'required' => false,
       'allowEmpty' => true
     ),
     'description' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     )
   );
   

Modified: registry/trunk/app/Model/CoEnrollmentFlow.php
===================================================================
--- registry/trunk/app/Model/CoEnrollmentFlow.php       2013-02-25 23:45:58 
UTC (rev 468)
+++ registry/trunk/app/Model/CoEnrollmentFlow.php       2013-02-26 02:43:41 
UTC (rev 469)
@@ -111,14 +111,17 @@
     ),
     'notify_on_early_provision' => array(
       'rule' => 'email',
+      'required' => false,
       'allowEmpty' => true
     ),
     'notify_on_provision' => array(
       'rule' => 'email',
+      'required' => false,
       'allowEmpty' => true
     ),
     'notify_on_active' => array(
       'rule' => 'email',
+      'required' => false,
       'allowEmpty' => true
     ),
     'status' => array(

Modified: registry/trunk/app/Model/CoGroup.php
===================================================================
--- registry/trunk/app/Model/CoGroup.php        2013-02-25 23:45:58 UTC (rev 
468)
+++ registry/trunk/app/Model/CoGroup.php        2013-02-26 02:43:41 UTC (rev 
469)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry CO Group Model
  *
- * Copyright (C) 2011-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2011-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) 2011-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2011-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
     ),
     'open' => array(
       'rule' => array('boolean')

Modified: registry/trunk/app/Model/CoIdentifierAssignment.php
===================================================================
--- registry/trunk/app/Model/CoIdentifierAssignment.php 2013-02-25 23:45:58 
UTC (rev 468)
+++ registry/trunk/app/Model/CoIdentifierAssignment.php 2013-02-26 02:43:41 
UTC (rev 469)
@@ -71,7 +71,8 @@
     ),
     'description' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'login' => array(
       'rule' => array('boolean'),

Modified: registry/trunk/app/Model/CoInvite.php
===================================================================
--- registry/trunk/app/Model/CoInvite.php       2013-02-25 23:45:58 UTC (rev 
468)
+++ registry/trunk/app/Model/CoInvite.php       2013-02-26 02:43:41 UTC (rev 
469)
@@ -57,11 +57,13 @@
     ),
     'mail' => array(
       'rule' => 'email',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'expires' => array(
       'rule' => '/.*/',  // The 'date' rule is too constraining
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     )
   );
   

Modified: registry/trunk/app/Model/CoNsfDemographic.php
===================================================================
--- registry/trunk/app/Model/CoNsfDemographic.php       2013-02-25 23:45:58 
UTC (rev 468)
+++ registry/trunk/app/Model/CoNsfDemographic.php       2013-02-26 02:43:41 
UTC (rev 469)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry CoNsfDemographic Model
  *
- * Copyright (C) 2011-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2011-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) 2011-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2011-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.3
@@ -48,18 +48,21 @@
     'gender' => array(
       'rule' => array('inList', array(NSFGenderEnum::Male,
                                       NSFGenderEnum::Female)),
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'citizenship' => array(
       'rule' => array('inList', array(NSFCitizenshipEnum::USCitizen,
                                       
NSFCitizenshipEnum::USPermanentResident,
                                       NSFCitizenshipEnum::Other)),
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'ethnicity' => array(
       'rule' => array('inList', array(NSFEthnicityEnum::Hispanic,
                                       NSFEthnicityEnum::NotHispanic)),
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'race' => array(
       'rule' => array('inList', array(NSFRaceEnum::Asian,

Modified: registry/trunk/app/Model/CoProvisioningTarget.php
===================================================================
--- registry/trunk/app/Model/CoProvisioningTarget.php   2013-02-25 23:45:58 
UTC (rev 468)
+++ registry/trunk/app/Model/CoProvisioningTarget.php   2013-02-26 02:43:41 
UTC (rev 469)
@@ -49,7 +49,8 @@
     ),
     'description' => array(
       'rule' => 'notEmpty',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'plugin' => array(
       // XXX This should be a dynamically generated list based on available 
plugins

Modified: registry/trunk/app/Model/Cou.php
===================================================================
--- registry/trunk/app/Model/Cou.php    2013-02-25 23:45:58 UTC (rev 468)
+++ registry/trunk/app/Model/Cou.php    2013-02-26 02:43:41 UTC (rev 469)
@@ -74,20 +74,24 @@
     ),
     'description' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'parent_id' => array(
       // Strangely, when specified is numeric cake decides to make required 
= true
       'rule' => '/[0-9]*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'lft' => array(
       'rule' => 'numeric',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'rght' => array(
       'rule' => 'numeric',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     )
   );
 

Modified: registry/trunk/app/Model/EmailAddress.php
===================================================================
--- registry/trunk/app/Model/EmailAddress.php   2013-02-25 23:45:58 UTC (rev 
468)
+++ registry/trunk/app/Model/EmailAddress.php   2013-02-26 02:43:41 UTC (rev 
469)
@@ -68,11 +68,13 @@
     ),
     'co_person_id' => array(
       'rule' => 'numeric',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'org_identity_id' => array(
       'rule' => 'numeric',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     )
   );
   

Modified: registry/trunk/app/Model/Identifier.php
===================================================================
--- registry/trunk/app/Model/Identifier.php     2013-02-25 23:45:58 UTC (rev 
468)
+++ registry/trunk/app/Model/Identifier.php     2013-02-26 02:43:41 UTC (rev 
469)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry Identifier 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
@@ -66,7 +66,8 @@
     ),
     'login' => array(
       'rule' => array('boolean'),
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'status' => array(
       'rule' => array('inList', array(StatusEnum::Active,
@@ -76,11 +77,13 @@
     ),
     'co_person_id' => array(
       'rule' => 'numeric',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'org_identity_id' => array(
       'rule' => 'numeric',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     )
   );
   

Modified: registry/trunk/app/Model/Name.php
===================================================================
--- registry/trunk/app/Model/Name.php   2013-02-25 23:45:58 UTC (rev 468)
+++ registry/trunk/app/Model/Name.php   2013-02-26 02:43:41 UTC (rev 469)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry Names 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
@@ -79,15 +79,18 @@
                                       NameEnum::FKA,
                                       NameEnum::Official,
                                       NameEnum::Preferred)),
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'co_person_id' => array(
       'rule' => 'numeric',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'org_identity_id' => array(
       'rule' => 'numeric',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     )
   );
 }
\ No newline at end of file

Modified: registry/trunk/app/Model/OrgIdentity.php
===================================================================
--- registry/trunk/app/Model/OrgIdentity.php    2013-02-25 23:45:58 UTC (rev 
468)
+++ registry/trunk/app/Model/OrgIdentity.php    2013-02-26 02:43:41 UTC (rev 
469)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry OrgIdentity Model
  *
- * Copyright (C) 2011-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.2
@@ -85,27 +85,33 @@
                                       AffiliationEnum::Affiliate,
                                       AffiliationEnum::Employee,
                                       AffiliationEnum::LibraryWalkIn)),
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'co_id' => array(
       'rule' => 'numeric',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'o' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'organization_id' => array(
       'rule' => 'numeric',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'ou' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'title' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
   );
   

Modified: registry/trunk/app/Model/Organization.php
===================================================================
--- registry/trunk/app/Model/Organization.php   2013-02-25 23:45:58 UTC (rev 
468)
+++ registry/trunk/app/Model/Organization.php   2013-02-26 02:43:41 UTC (rev 
469)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry Organization 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
@@ -46,15 +46,18 @@
     ),
     'domain' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'directory' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
     'search_base' => array(
       'rule' => '/.*/',
-      'required' => false
+      'required' => false,
+      'allowEmpty' => true
     ),
   );
 }