COmanage Developers List

Author: benno
Date: 2013-12-18 09:18:34 -0500 (Wed, 18 Dec 2013)
New Revision: 645

Modified:
   registry/trunk/app/Controller/VootController.php
   registry/trunk/app/Model/CoPerson.php
Log:
Fix identifier based query for Voot (CO-744)

Modified: registry/trunk/app/Controller/VootController.php
===================================================================
--- registry/trunk/app/Controller/VootController.php    2013-12-14 16:38:51 
UTC (rev 644)
+++ registry/trunk/app/Controller/VootController.php    2013-12-18 14:18:34 
UTC (rev 645)
@@ -81,7 +81,8 @@
       try {
         // XXX We should really provide an identifier type. Instead, we'll 
just
         // take the first person returned.
-        $coppl = $this->CoPerson->idsForIdentifier($memberid, null);
+        // We only look at login identifiers.
+        $coppl = $this->CoPerson->idsForIdentifier($memberid, null, true);
         
         if(!empty($coppl)) {
           $this->coPersonIdReq = $coppl[0];

Modified: registry/trunk/app/Model/CoPerson.php
===================================================================
--- registry/trunk/app/Model/CoPerson.php       2013-12-14 16:38:51 UTC (rev 
644)
+++ registry/trunk/app/Model/CoPerson.php       2013-12-18 14:18:34 UTC (rev 
645)
@@ -209,7 +209,9 @@
     
     $args = array();
     $args['conditions']['Identifier.identifier'] = $identifier;
-    $args['conditions']['Identifier.login'] = $login;
+    if($login) {
+      $args['conditions']['Identifier.login'] = true;
+    }
     $args['conditions']['Identifier.status'] = StatusEnum::Active;
     $args['contain'] = false;