COmanage Developers List

Author: benno
Date: 2013-01-25 18:41:50 -0500 (Fri, 25 Jan 2013)
New Revision: 409

Modified:
   registry/trunk/app/Controller/AppController.php
   registry/trunk/app/View/Elements/dropMenu.ctp
Log:
Fix rendering of org identities menu item when org identities are pooled 
(CO-527)

Modified: registry/trunk/app/Controller/AppController.php
===================================================================
--- registry/trunk/app/Controller/AppController.php     2013-01-25 16:58:14 
UTC (rev 408)
+++ registry/trunk/app/Controller/AppController.php     2013-01-25 23:41:50 
UTC (rev 409)
@@ -1069,7 +1069,11 @@
       // Set for home ID name in menu
       $menu['orgName'] = $orgName['OrgIdentity']['o'];
     }
-
+    
+    // Determine if Org Identities are pooled
+    $this->loadModel('CmpEnrollmentConfiguration');
+    $this->set('pool_org_identities', 
$this->CmpEnrollmentConfiguration->orgIdentitiesPooled());
+    
     // Set the COs for display
     if($this->viewVars['permissions']['menu']['admin']) {
       // Show all active COs for admins

Modified: registry/trunk/app/View/Elements/dropMenu.ctp
===================================================================
--- registry/trunk/app/View/Elements/dropMenu.ctp       2013-01-25 16:58:14 
UTC (rev 408)
+++ registry/trunk/app/View/Elements/dropMenu.ctp       2013-01-25 23:41:50 
UTC (rev 409)
@@ -6,7 +6,7 @@
  * Version: $Revision$
  * Date: $Date$
  *
- * Copyright (C) 2012 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2012-13 University Corporation for Advanced Internet 
Development, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -86,12 +86,15 @@
                   print '<ul>';
                   
                   if(isset($permissions['menu']['orgidentities']) && 
$permissions['menu']['orgidentities']) {
+                    $args = array();
+                    $args['controller'] = 'org_identities';
+                    $args['action'] = 'index';
+                    
+                    if(!$pool_org_identities) {
+                      $args['co'] = $menuCoId;
+                    }
+                    
                     print "<li>";
-                      $args = array(
-                        'controller' => 'org_identities',
-                        'action' => 'index',
-                        'co' => $menuCoId
-                      );
                       print $this->Html->link(_txt('ct.org_identities.pl'), 
$args);
                     print "</li>";
                   }