COmanage Developers List

Author: benno
Date: 2013-05-05 23:27:29 -0400 (Sun, 05 May 2013)
New Revision: 514

Modified:
   registry/trunk/app/Lib/enum.php
   registry/trunk/app/Lib/lang.php
   registry/trunk/app/Model/CoGroup.php
   registry/trunk/app/View/CoGroups/fields.inc
Log:
CO Group uses SuspendableStatusEnum (CO-602)

Modified: registry/trunk/app/Lib/enum.php
===================================================================
--- registry/trunk/app/Lib/enum.php     2013-05-06 02:22:38 UTC (rev 513)
+++ registry/trunk/app/Lib/enum.php     2013-05-06 03:27:29 UTC (rev 514)
@@ -316,6 +316,12 @@
   );*/
 }
 
+class SuspendableStatusEnum
+{
+  const Active              = 'A';
+  const Suspended           = 'S';
+}
+
 // Old style enums below, deprecated
 // In order to switch away from them, AppController::convertRestPost
 // and checkRestPost must be rewritten, as well as 
Model/CoEnrollmentAttribute::enrollmentFlowAttributes.

Modified: registry/trunk/app/Lib/lang.php
===================================================================
--- registry/trunk/app/Lib/lang.php     2013-05-06 02:22:38 UTC (rev 513)
+++ registry/trunk/app/Lib/lang.php     2013-05-06 03:27:29 UTC (rev 514)
@@ -239,6 +239,11 @@
     ProvisioningStatusEnum::Unknown        => 'Unknown'
   ),
   
+  'en.status.susp' => array(
+    SuspendableStatusEnum::Active              => 'Active',
+    SuspendableStatusEnum::Suspended           => 'Suspended'
+  ),
+  
   // Demographics
   'en.nsf.gender' =>       array(NSFGenderEnum::Female => 'Female',
                                  NSFGenderEnum::Male   => 'Male'),

Modified: registry/trunk/app/Model/CoGroup.php
===================================================================
--- registry/trunk/app/Model/CoGroup.php        2013-05-06 02:22:38 UTC (rev 
513)
+++ registry/trunk/app/Model/CoGroup.php        2013-05-06 03:27:29 UTC (rev 
514)
@@ -75,8 +75,8 @@
       'rule' => array('boolean')
     ),
     'status' => array(
-      'rule' => array('inList', array(StatusEnum::Active,
-                                      StatusEnum::Suspended)),
+      'rule' => array('inList', array(SuspendableStatusEnum::Active,
+                                      SuspendableStatusEnum::Suspended)),
       'required' => true,
       'message' => 'A valid status must be selected'
     )

Modified: registry/trunk/app/View/CoGroups/fields.inc
===================================================================
--- registry/trunk/app/View/CoGroups/fields.inc 2013-05-06 02:22:38 UTC (rev 
513)
+++ registry/trunk/app/View/CoGroups/fields.inc 2013-05-06 03:27:29 UTC (rev 
514)
@@ -105,7 +105,7 @@
           
           if($e) {
             print $this->Form->select('status',
-                                      $cm_texts[ $cm_lang ]['en.status'],
+                                      $cm_texts[ $cm_lang 
]['en.status.susp'],
                                       $attrs);
             
             if($this->Form->isFieldError('status')) {