Changeset 3167 for branches/2.2/workflow/inc/class.ui_participants.inc.php

Timestamp:

08/17/10 16:17:12 (14 years ago)

Author:

viani

Message:

Ticket #1135 - Merged r1990:3166 from /trunk/workflow into /branches/2.2/workflow

File:

• branches/2.2/workflow/inc/class.ui_participants.inc.php (modified) (5 diffs)

branches/2.2/workflow/inc/class.ui_participants.inc.php

@@ -41 +41 @@
         function ui_participants()
         {
-                $this->bo = $GLOBALS['workflow']['factory']->getInstance('bo_participants');
+                $this->bo = Factory::getInstance('bo_participants');
         }
 
@@ -51 +51 @@
         function form()
         {
-                $smarty = $GLOBALS['workflow']['factory']->getInstance('workflow_smarty', false);
+                $smarty = Factory::getInstance('workflow_smarty', false);
                 $smarty->setHeader(workflow_smarty::SHOW_HEADER | workflow_smarty::SHOW_FOOTER);
-                $ldap = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+                $ldap = Factory::getInstance('WorkflowLDAP');
                 $userDN = $GLOBALS['phpgw_info']['user']['account_dn'];
-                $account = $GLOBALS['workflow']['factory']->getForeignInstance('phpgwapi', 'accounts', $userDN);
+                $account = Factory::getInstance('accounts', $userDN);
                 $organizationList = $this->bo->getOrganizations();
 
@@ -92 +92 @@
                 $hideSectors = ($_REQUEST['hideSectors'] == '1') ? true : false;
 
+                // the default value of $onlyVisibleAccounts is true
+                if((isset($_REQUEST['onlyVisibleAccounts'])) && (empty($_REQUEST['onlyVisibleAccounts']) || $_REQUEST['onlyVisibleAccounts'] === 'false'))
+                        $onlyVisibleAccounts = false;
+                else
+                        $onlyVisibleAccounts = true;
+
                 /* define the initial organization */
                 $selectedOrganization = $ldap->getOrganizationFromDN($userDN);
@@ -117 +123 @@
                 $smarty->assign('organizations', $organizationList);
                 $smarty->assign('selectedOrganization', $selectedOrganization);
-                $smarty->assign('sectors', $this->bo->getSectors(array('organization' => $selectedOrganization), true));
+                $smarty->assign('sectors', $this->bo->getSectors(array('organization' => $selectedOrganization, 'onlyVisibleAccounts' => $onlyVisibleAccounts), true));
                 $smarty->assign('selectedSector', $selectedSector);
-                $smarty->assign('participants', $this->bo->getEntities(array('entities' => $entities, 'id' => $id, 'context' => $selectedSector, 'usePreffix' => $usePreffix), true));
+                $smarty->assign('participants', $this->bo->getEntities(array('entities' => $entities, 'id' => $id, 'context' => $selectedSector, 'onlyVisibleAccounts' => $onlyVisibleAccounts, 'usePreffix' => $usePreffix), true));
                 $smarty->assign('entities', $entities);
                 $smarty->assign('id', $id);
@@ -126 +132 @@
                 $smarty->assign('hideOrganizations', $hideOrganizations);
                 $smarty->assign('hideSectors', $hideSectors);
+                $smarty->assign('onlyVisibleAccounts', $onlyVisibleAccounts);
                 $smarty->assign('header', $smarty->expressoHeader);
                 $smarty->assign('txt_loading', lang("loading"));