COmanage Developers List

Author: benno
Date: 2013-12-21 18:56:11 -0500 (Sat, 21 Dec 2013)
New Revision: 647

Modified:
   registry/trunk/app/Controller/VootController.php
   registry/trunk/app/Model/CoPerson.php
   registry/trunk/app/View/Voot/json/people.ctp
Log:
Fix VootController name rendering (CO-747)

Modified: registry/trunk/app/Controller/VootController.php
===================================================================
--- registry/trunk/app/Controller/VootController.php    2013-12-18 19:47:05 
UTC (rev 646)
+++ registry/trunk/app/Controller/VootController.php    2013-12-21 23:56:11 
UTC (rev 647)
@@ -81,8 +81,9 @@
       try {
         // XXX We should really provide an identifier type. Instead, we'll 
just
         // take the first person returned.
-        // We only look at login identifiers.
-        $coppl = $this->CoPerson->idsForIdentifier($memberid, null, true);
+        // Don't look for login identifiers only since conext needs to map 
urn:
+        // style identifiers.
+        $coppl = $this->CoPerson->idsForIdentifier($memberid, null);
         
         if(!empty($coppl)) {
           $this->coPersonIdReq = $coppl[0];

Modified: registry/trunk/app/Model/CoPerson.php
===================================================================
--- registry/trunk/app/Model/CoPerson.php       2013-12-18 19:47:05 UTC (rev 
646)
+++ registry/trunk/app/Model/CoPerson.php       2013-12-21 23:56:11 UTC (rev 
647)
@@ -154,7 +154,7 @@
     $args['conditions']['OR']['CoGroupMember.member'] = 1;
     $args['conditions']['OR']['CoGroupMember.owner'] = 1;
     // We use contain here to pull data for VootController
-    $args['contain'][] = 'Name';
+    $args['contain'][] = 'PrimaryName';
     $args['contain'][] = 'EmailAddress';
     
     if($limit) {

Modified: registry/trunk/app/View/Voot/json/people.ctp
===================================================================
--- registry/trunk/app/View/Voot/json/people.ctp        2013-12-18 19:47:05 
UTC (rev 646)
+++ registry/trunk/app/View/Voot/json/people.ctp        2013-12-21 23:56:11 
UTC (rev 647)
@@ -54,11 +54,11 @@
       
       $people[] = array(
         'id'                    => $pid,
-        'displayName'           => generateCn($p['Name']),
+        'displayName'           => generateCn($p['PrimaryName']),
         'name'                  => array(
-          'formatted'             => generateCn($p['Name']),
-          'givenName'             => $p['Name']['given'],
-          'familyName'            => $p['Name']['family'],
+          'formatted'             => generateCn($p['PrimaryName']),
+          'givenName'             => $p['PrimaryName']['given'],
+          'familyName'            => $p['PrimaryName']['family'],
         ),
         'emails'                => $email,
         'voot_membership_role'  => $grole