Changeset 3715

Timestamp:

01/21/11 15:10:18 (13 years ago)

Author:

asaikawa

Message:

Ticket #317 - Criado parametro para permitir que a busca global seja selecionada ao abrir a janela de selecao

Location:

branches/2.2/workflow

Files:

• inc/class.ui_participants.inc.php (modified) (2 diffs)
• inc/smarty/wf_plugins/function.wf_select_user.php (modified) (3 diffs)
• inc/smarty/wf_plugins/function.wf_select_users.php (modified) (3 diffs)
• templates/default/participants.tpl (modified) (1 diff)

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

@@ -98 +98 @@
                         $onlyVisibleAccounts = true;
 
+                // the default value of $useGlobalSearch is false
+                if((isset($_REQUEST['useGlobalSearch'])) && (empty($_REQUEST['useGlobalSearch']) || $_REQUEST['useGlobalSearch'] === 'false'))
+                        $useGlobalSearch = false;
+                else
+                        $useGlobalSearch = true;
+
                 /* define the initial organization */
                 $selectedOrganization = $ldap->getOrganizationFromDN($userDN);
@@ -133 +139 @@
                 $smarty->assign('hideSectors', $hideSectors);
                 $smarty->assign('onlyVisibleAccounts', $onlyVisibleAccounts);
+                $smarty->assign('useGlobalSearch', $useGlobalSearch);
                 $smarty->assign('header', $smarty->expressoHeader);
                 $smarty->assign('txt_loading', lang("loading"));

branches/2.2/workflow/inc/smarty/wf_plugins/function.wf_select_user.php

@@ -37 +37 @@
                 'hide_sectors' => false,
                 'onlyVisibleAccounts' => true,
+                'useGlobalSearch' => false,
                 'rows'=> 2);
         $extractParams = array(
@@ -45 +46 @@
                 'cols',
                 'rows',
-                'onlyVisibleAccounts');
+                'onlyVisibleAccounts',
+                'useGlobalSearch');
 
         /* verifica se todos os parâmetros obrigatórios foram passados */
@@ -100 +102 @@
         else
                 $extraParams .= "&onlyVisibleAccounts=true";
+        if (empty($useGlobalSearch) || $useGlobalSearch === 'false')
+                $extraParams .= "&useGlobalSearch=false";
+        else
+                $extraParams .= "&useGlobalSearch=true";
 
         $image = Factory::getInstance('TemplateServer')->generateImageLink('add_user.png');

branches/2.2/workflow/inc/smarty/wf_plugins/function.wf_select_users.php

@@ -27 +27 @@
                 'hide_sectors' => false,
                 'onlyVisibleAccounts' => true,
+                'useGlobalSearch' => false,
                 'get_email' => false,
                 'value' => array());
@@ -32 +33 @@
                 'name',
                 'value',
-                'onlyVisibleAccounts');
+                'onlyVisibleAccounts',
+                'useGlobalSearch');
 
         /* verifica se todos os parâmetros obrigatórios foram passados */
@@ -66 +68 @@
         else
                 $extraParams .= "&onlyVisibleAccounts=true";
+        if (empty($useGlobalSearch) || $useGlobalSearch === 'false')
+                $extraParams .= "&useGlobalSearch=false";
+        else
+                $extraParams .= "&useGlobalSearch=true";
 
         $output = '<table border="0"><tr><td>';

branches/2.2/workflow/templates/default/participants.tpl

@@ -42 +42 @@
         <tr>
                 <td>
-                        <label><input type="checkbox" name="useGlobalSearch" id="useGlobalSearch"/> Utilizar busca global</label>
+                        <label><input type="checkbox" name="useGlobalSearch" id="useGlobalSearch" {if $useGlobalSearch} checked {/if}/> Utilizar busca global</label>
                 </td>
                 <td>