COmanage Developers List

Author: benno
Date: 2013-11-07 09:53:10 -0500 (Thu, 07 Nov 2013)
New Revision: 628

Modified:
   registry/trunk/app/Plugin/LdapProvisioner/Model/CoLdapProvisionerTarget.php
   
registry/trunk/app/Plugin/LdapProvisioner/View/CoLdapProvisionerTargets/fields.inc
Log:
Allow uid to be populated from org identity (CO-726) and related bug fixes

Modified: 
registry/trunk/app/Plugin/LdapProvisioner/Model/CoLdapProvisionerTarget.php
===================================================================
--- 
registry/trunk/app/Plugin/LdapProvisioner/Model/CoLdapProvisionerTarget.php 
2013-11-06 13:17:29 UTC (rev 627)
+++ 
registry/trunk/app/Plugin/LdapProvisioner/Model/CoLdapProvisionerTarget.php 
2013-11-07 14:53:10 UTC (rev 628)
@@ -275,14 +275,13 @@
                   // which identity do we choose? For now, the first one.
                   
                   
if(isset($provisioningData['CoOrgIdentityLink'][0]['OrgIdentity'][ 
$mods[$attr] ])) {
-                    $modelList =& 
$provisioningData['CoOrgIdentityLink'][0]['OrgIdentity'][ $mods[$attr] ];
+                    // Don't use =& syntax here, it changes $provisioningData
+                    $modelList = 
$provisioningData['CoOrgIdentityLink'][0]['OrgIdentity'][ $mods[$attr] ];
                   }
                 } elseif(isset($provisioningData[ $mods[$attr] ])) {
                   // Use CO Person value for this attribute
-                  $modelList =& $provisioningData[ $mods[$attr] ];
+                  $modelList = $provisioningData[ $mods[$attr] ];
                 }
-                // Next: if useorgvalue reference 
$provisioningData['CoOrgIdentityLink']['OrgIdentity'][ $mods[$attr] ] instead
-                // perhaps using =& to avoid copying arrays
                 
                 // Walk through each model instance
                 $found = false;
@@ -981,6 +980,7 @@
           'uid' => array(
             'required'    => false,
             'multiple'    => false,
+            'alloworgvalue' => true,
             'extendedtype' => 'identifier_types',
             'defaulttype' => IdentifierEnum::UID
           )

Modified: 
registry/trunk/app/Plugin/LdapProvisioner/View/CoLdapProvisionerTargets/fields.inc
===================================================================
--- 
registry/trunk/app/Plugin/LdapProvisioner/View/CoLdapProvisionerTargets/fields.inc
  2013-11-06 13:17:29 UTC (rev 627)
+++ 
registry/trunk/app/Plugin/LdapProvisioner/View/CoLdapProvisionerTargets/fields.inc
  2013-11-07 14:53:10 UTC (rev 628)
@@ -333,6 +333,7 @@
                     $xval = "";
                     $xempty = 
$supportedAttributes[$oc]['groupings'][$grouping]['multiple']
                               ? _txt('pl.ldapprovisioner.types.all') : false;
+                    $xrequired = !(boolean)$xempty;
                     
                     if(isset($currentGroupings[$grouping]['type'])) {
                       $xval = $currentGroupings[$grouping]['type'];
@@ -342,8 +343,9 @@
                     
                     print " " . $this->Form->select($xgprefix . '.type',
                                                     $xtypeopts,
-                                                    array('value' => $xval,
-                                                          'empty' => 
$xempty));
+                                                    array('value'    => 
$xval,
+                                                          'empty'    => 
$xempty,
+                                                          'required' => 
$xrequired));
                   }
                   
                   print "<br />\n";