COmanage Developers List

Author: benno
Date: 2013-01-25 11:58:14 -0500 (Fri, 25 Jan 2013)
New Revision: 408

Modified:
   registry/trunk/app/Config/Schema/schema.xml
   registry/trunk/app/Controller/CmpEnrollmentConfigurationsController.php
Log:
Interim schema adjustment and rollback of last change for CO-290

Modified: registry/trunk/app/Config/Schema/schema.xml
===================================================================
--- registry/trunk/app/Config/Schema/schema.xml 2013-01-25 04:41:57 UTC (rev 
407)
+++ registry/trunk/app/Config/Schema/schema.xml 2013-01-25 16:58:14 UTC (rev 
408)
@@ -504,7 +504,7 @@
     <field name="attribute" type="C" size="80">
       <notnull />
     </field>
-    <field name="type" type="C" size="2" />
+    <field name="type" type="C" size="16" />
     <field name="required" type="I" />
     <field name="ldap_name" type="C" size="80" />
     <field name="saml_name" type="C" size="80" />

Modified: 
registry/trunk/app/Controller/CmpEnrollmentConfigurationsController.php
===================================================================
--- registry/trunk/app/Controller/CmpEnrollmentConfigurationsController.php   
  2013-01-25 04:41:57 UTC (rev 407)
+++ registry/trunk/app/Controller/CmpEnrollmentConfigurationsController.php   
  2013-01-25 16:58:14 UTC (rev 408)
@@ -422,11 +422,8 @@
       );
     }
     
-    if(0 && !empty($newattrs))
+    if(!empty($newattrs))
     {
-      // XXX We don't need CMP Enrollment Attributes anymore. This can 
probably
-      // all be pulled. (See also CO-290.)
-      
       
$this->CmpEnrollmentConfiguration->CmpEnrollmentAttribute->SaveAll($newattrs);
     }