COmanage Developers List

Author: benno
Date: 2013-04-11 18:38:53 -0400 (Thu, 11 Apr 2013)
New Revision: 491

Modified:
   registry/trunk/app/Model/CoEnrollmentAttribute.php
   registry/trunk/app/Model/CoPerson.php
   registry/trunk/app/Model/CoPersonRole.php
Log:
Fix various petition validation errors (CO-586)

Modified: registry/trunk/app/Model/CoEnrollmentAttribute.php
===================================================================
--- registry/trunk/app/Model/CoEnrollmentAttribute.php  2013-04-10 12:25:18 
UTC (rev 490)
+++ registry/trunk/app/Model/CoEnrollmentAttribute.php  2013-04-11 22:38:53 
UTC (rev 491)
@@ -277,6 +277,9 @@
             $attr['select'] = 
$this->CoEnrollmentFlow->CoPetition->Cou->find('list', $args);
             $attr['validate']['rule'][0] = 'inList';
             $attr['validate']['rule'][1] = array_keys($attr['select']);
+            // As of Cake 2.1, inList doesn't work for integers unless you 
set strict to false
+            // 
https://cakephp.lighthouseapp.com/projects/42648/tickets/2770-inlist-doesnt-work-more-in-21
+            $attr['validate']['rule'][2] = false;
           } else {
             // Default behavior for all other attributes
             

Modified: registry/trunk/app/Model/CoPerson.php
===================================================================
--- registry/trunk/app/Model/CoPerson.php       2013-04-10 12:25:18 UTC (rev 
490)
+++ registry/trunk/app/Model/CoPerson.php       2013-04-11 22:38:53 UTC (rev 
491)
@@ -109,6 +109,7 @@
                                       StatusEnum::Invited,
                                       StatusEnum::Pending,
                                       StatusEnum::PendingApproval,
+                                      StatusEnum::PendingConfirmation,
                                       StatusEnum::Suspended)),
       'required' => true,
       'message' => 'A valid status must be selected'

Modified: registry/trunk/app/Model/CoPersonRole.php
===================================================================
--- registry/trunk/app/Model/CoPersonRole.php   2013-04-10 12:25:18 UTC (rev 
490)
+++ registry/trunk/app/Model/CoPersonRole.php   2013-04-11 22:38:53 UTC (rev 
491)
@@ -113,6 +113,7 @@
                                       StatusEnum::Invited,
                                       StatusEnum::Pending,
                                       StatusEnum::PendingApproval,
+                                      StatusEnum::PendingConfirmation,
                                       StatusEnum::Suspended))
     ),
     'sponsor_co_person_id' => array(