Changeset 8232 for branches/2.5/workflow


Ignore:
Timestamp:
10/08/13 16:20:46 (11 years ago)
Author:
douglas
Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

Location:
branches/2.5/workflow
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/2.5/workflow/inc/class.Logger.inc.php

    r3167 r8232  
    2929 
    3030        /** 
     31         * @var object $db Objeto de banco de dados do modulo workflow 
     32         * @access private 
     33         */ 
     34        private $dbGalaxia = null; 
     35 
     36        /** 
    3137         * @var string $logPath Caminho onde será salvo o arquivo de log, caso o tipo de log Log_file seja adicionado à composição 
    3238         * @access private 
    … …  
    8187 
    8288                $this->db =& Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID; 
     89                $this->dbGalaxia =& Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID; 
    8390 
    8491                if(!empty($curProcessName)){ 
     92 
    8593                        $query = ' 
    8694                                SELECT 
    … …  
    8997                                        egw_wf_processes'; 
    9098 
    91                         if(!($result = $this->db->query($query))) 
     99                        if(!($result = $this->dbGalaxia->query($query))) 
    92100                                throw new Exception(lang('Cannot execute query')); 
    93101 
    … …  
    131139                                                wf_config_name like 'log_level' 
    132140                                                "; 
    133                         $config_value = array_pop($this->db->query($query)->GetArray(-1)); 
     141                        $config_value = array_pop($this->dbGalaxia->query($query)->GetArray(-1)); 
    134142                        $this->logLevel = $config_value['wf_config_value_int']; 
    135143                } else { 

  • branches/2.5/workflow/inc/local/classes/class.wf_instance.php

    r5928 r8232  
    443443 
    444444        /** 
     445        * Busca uma instância pelo id 
     446        * @param int $wf_instance_id O id da instância 
     447        * @return array As instâncias que satisfazem o critério de seleção. 
     448        * @access public 
     449        */ 
     450        public function getById($wf_instance_id) 
     451        { 
     452                /* build the SQL query */ 
     453                $query = 'SELECT i.wf_instance_id AS wf_instance_id, ia.wf_activity_id AS wf_activity_id, ia.wf_started AS wf_started, i.wf_name AS wf_name, i.wf_status AS wf_status, ia.wf_user AS wf_user, i.wf_priority AS wf_priority '; 
     454                $query .= 'FROM egw_wf_instances i LEFT JOIN egw_wf_instance_activities ia ON (ia.wf_instance_id = i.wf_instance_id)'; 
     455                $query .= 'WHERE (i.wf_p_id = ?) AND i.wf_instance_id = ?'; 
     456 
     457                $resultSet = $this->db->query($query, array($this->processID, intval($wf_instance_id))); 
     458                 
     459                return $resultSet->GetArray(); 
     460        } 
     461 
     462        /** 
    445463        * Busca todas as instâncias que possuem esse nome (identificador). 
    446464        * @param string $name O nome da instância que se quer encontrar. 
    … …  
    456474 
    457475                $resultSet = $this->db->query($query, array($this->processID, $name)); 
     476                return $resultSet->GetArray(); 
     477        } 
     478 
     479        /** 
     480        * Busca todas as instâncias que possuem um trecho do nome (identificador). 
     481        * @param string $name O trecho do nome da instância que se quer encontrar. 
     482        * @return array As instâncias que satisfazem o critério de seleção. 
     483        * @access public 
     484        */ 
     485        public function getLikeName($name) 
     486        { 
     487                /* build the SQL query */ 
     488                $query = 'SELECT i.wf_instance_id AS wf_instance_id, ia.wf_activity_id AS wf_activity_id, ia.wf_started AS wf_started, i.wf_name AS wf_name, i.wf_status AS wf_status, ia.wf_user AS wf_user, i.wf_priority AS wf_priority '; 
     489                $query .= 'FROM egw_wf_instances i LEFT JOIN egw_wf_instance_activities ia ON (ia.wf_instance_id = i.wf_instance_id)'; 
     490                $query .= "WHERE (i.wf_p_id = ?) AND i.wf_name ILIKE '%$name%'"; 
     491 
     492                $resultSet = $this->db->query($query, array($this->processID)); 
     493 
    458494                return $resultSet->GetArray(); 
    459495        } 
    … …  
    584620                return $this->setUser($instanceID, $activityID, 'p' . $roleID); 
    585621        } 
     622 
     623        /** 
     624        * Altera o wf_name das instâncias, fazendo o replace no nome da categoria de serviço.  
     625        * Método chamado quando é alterada a categoria de um serviço e existem ocorrências atrelados a esse serviço. 
     626        * @param int | array $instanceID se for um array, concatena os instances ids 
     627        * @param string @currentServiceName Nome da categoria de serviço atual 
     628        * @param string @newServiceName Nome da nova categoria de serviço 
     629        * @return resultSet em caso de sucesso ou false 
     630        * @access public  
     631        */ 
     632        public function updateReplaceName($instanceID, $currentServiceName, $newServiceName) 
     633        { 
     634                $success = true; 
     635 
     636                // Se for array, faz implode concatenando os ids 
     637                if (is_array($instanceID)) 
     638                { 
     639                        $instanceID = implode(',', $instanceID); 
     640                } 
     641 
     642                $query = "UPDATE egw_wf_instances SET wf_name = REPLACE(wf_name, '" . $currentServiceName . "', '" . $newServiceName . "') WHERE wf_instance_id IN (" . $instanceID . ")"; 
     643                $success = $this->db->execute($query); 
     644 
     645                return $success; 
     646        } 
    586647} 
    587648?> 

  • branches/2.5/workflow/inc/smarty/wf_plugins/function.wf_select_user.php

    r4740 r8232  
    115115 
    116116        $output .= <<<EOF 
    117                 <a alt="$title" title="$title" href="javascript:void(0)" onclick="openParticipants('$name', '$extraParams');"><img border="0" alt="" src="$image" /></a> 
     117                <a alt="$title" title="$title" href="javascript:void(0)" onclick="openParticipantsWindow('$name', '$extraParams');"><img border="0" alt="" src="$image" /></a> 
    118118EOF; 
    119119        return $output; 

  • branches/2.5/workflow/js/adminaccess/control_folder.js

    r3255 r8232  
    416416        bt.setAttribute('name','Selecionar'); 
    417417        bt.setAttribute('value','Selecionar'); 
    418         bt.onclick = function() { openParticipants('sel_org_user', 'hidegroups=1'); }; 
     418        bt.onclick = function() { openParticipantsWindow('sel_org_user', 'hidegroups=1'); }; 
    419419        td.appendChild(bt); 
    420420 
    … …  
    575575        bt.setAttribute('name','Selecionar'); 
    576576        bt.setAttribute('value','Selecionar'); 
    577         bt.onclick = function() { openParticipants('sel_proc_user', ''); }; 
     577        bt.onclick = function() { openParticipantsWindow('sel_proc_user', ''); }; 
    578578        td.appendChild(bt); 
    579579 
    … …  
    726726        bt.setAttribute('name','Selecionar'); 
    727727        bt.setAttribute('value','Selecionar'); 
    728         bt.onclick = function() { openParticipants('sel_mon_user', ''); }; 
     728        bt.onclick = function() { openParticipantsWindow('sel_mon_user', ''); }; 
    729729        td.appendChild(bt); 
    730730 
    … …  
    785785        content += '<td align="right"><input type="button" name="Remover" value="Remover" onclick="deleteExternalApplicationAdmin();"/></td>'; 
    786786        content += '<td></td>'; 
    787         content += '<td align="right"><input type="button" name="Selecionar" value="Selecionar" onclick="openParticipants(\'sel_exa_user\', \'\')"/><input type="button" name="Remover" value="Remover" onclick="del_selected_reg(\'sel_exa_user\');"/></td>'; 
     787        content += '<td align="right"><input type="button" name="Selecionar" value="Selecionar" onclick="openParticipantsWindow(\'sel_exa_user\', \'\')"/><input type="button" name="Remover" value="Remover" onclick="del_selected_reg(\'sel_exa_user\');"/></td>'; 
    788788        content += '</tr>'; 
    789789        content += '<tr><td colspan="3"></td></tr>'; 
    … …  
    849849        content += '<td align="right"><input type="button" name="Remover" value="Remover" onclick="deleteWorkflowAdministrators();"/></td>'; 
    850850        content += '<td></td>'; 
    851         content += '<td align="right"><input type="button" name="Selecionar" value="Selecionar" onclick="openParticipants(\'selectWorkflowUsers\', \'\')"/><input type="button" name="Remover" value="Remover" onclick="del_selected_reg(\'selectWorkflowUsers\');"/></td>'; 
     851        content += '<td align="right"><input type="button" name="Selecionar" value="Selecionar" onclick="openParticipantsWindow(\'selectWorkflowUsers\', \'\')"/><input type="button" name="Remover" value="Remover" onclick="del_selected_reg(\'selectWorkflowUsers\');"/></td>'; 
    852852        content += '</tr>'; 
    853853        content += '<tr><td colspan="3"></td></tr>'; 
    … …  
    901901        content += '<td align="right"><input type="button" name="Remover" value="Remover" onclick="deleteDevelopmentAdministrators();"/></td>'; 
    902902        content += '<td></td>'; 
    903         content += '<td align="right"><input type="button" name="Selecionar" value="Selecionar" onclick="openParticipants(\'selectDevelopmentUsers\', \'\')"/><input type="button" name="Remover" value="Remover" onclick="del_selected_reg(\'selectDevelopmentUsers\');"/></td>'; 
     903        content += '<td align="right"><input type="button" name="Selecionar" value="Selecionar" onclick="openParticipantsWindow(\'selectDevelopmentUsers\', \'\')"/><input type="button" name="Remover" value="Remover" onclick="del_selected_reg(\'selectDevelopmentUsers\');"/></td>'; 
    904904        content += '</tr>'; 
    905905        content += '<tr><td colspan="3"></td></tr>'; 

  • branches/2.5/workflow/js/jscode/participants.js

    r3729 r8232  
    364364} 
    365365 
    366 function openParticipants(target, option) 
     366function openParticipantsWindow(target, option) 
    367367{ 
    368368        newWidth   = 500; 

  • branches/2.5/workflow/js/monitors/processes.js

    r795 r8232  
    101101                                content += '<td><input type="hidden" name="newUser" id="newUser" value="" />'; 
    102102                                content += '<input type="input" name="newUser_desc" id="newUser_desc" value="" readonly="true" size="32" />'; 
    103                                 content += '<a href="javascript:void(0)" onclick="openParticipants(\'newUser\', \'uid=1&hidegroups=1\');"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/add_user.png"/></a></td></tr>'; 
     103                                content += '<a href="javascript:void(0)" onclick="openParticipantsWindow(\'newUser\', \'uid=1&hidegroups=1\');"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/add_user.png"/></a></td></tr>'; 
    104104                                content += '<tr><td colspan="2"><button onclick="clickLoadActivities(' + pid + ');return false;">Próximo >></button></td></tr></table>'; 
    105105                                content += '</td>'; 

  • branches/2.5/workflow/js/orgchart/organization.js

    r7379 r8232  
    736736        content += '<input type="hidden" name="funcionario_id" id="funcionario_id" value="" />'; 
    737737        content += '<input type="input" name="funcionario_id_desc" id="funcionario_id_desc" value="" readonly="true" size="40" />'; 
    738         content += '<a href="javascript:void(0)" onclick="openParticipants(\'funcionario_id\', \'uid=1&hidegroups=1\');" id="addEmployeeLink"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/add_user.png" /></a>'; 
     738        content += '<a href="javascript:void(0)" onclick="openParticipantsWindow(\'funcionario_id\', \'uid=1&hidegroups=1\');" id="addEmployeeLink"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/add_user.png" /></a>'; 
    739739        content += '</td></tr>'; 
    740740        content += '<tr><td><label for="funcionario_status_id">Status</label></td><td id="comboStatus"><i>carregando</i></td></tr>'; 
    … …  
    801801        content += '<input type="hidden" name="titular_funcionario_id" id="titular_funcionario_id" value="" />'; 
    802802        content += '<input type="input" name="titular_funcionario_id_desc" id="titular_funcionario_id_desc" value="" readonly="true" size="40" />'; 
    803         content += '<a href="javascript:void(0)" onclick="openParticipants(\'titular_funcionario_id\', \'uid=1&hidegroups=1\');"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/add_user.png" /></a>'; 
     803        content += '<a href="javascript:void(0)" onclick="openParticipantsWindow(\'titular_funcionario_id\', \'uid=1&hidegroups=1\');"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/add_user.png" /></a>'; 
    804804        content += ' <a href="javascript:void(0)" onclick="$(\'titular_funcionario_id\').value=\'\'; $(\'titular_funcionario_id_desc\').value=\'\'; return false;"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/delete_user.png" /></a>'; 
    805805        content += '</td></tr>'; 
    … …  
    807807        content += '<input type="hidden" name="auxiliar_funcionario_id" id="auxiliar_funcionario_id" value="" />'; 
    808808        content += '<input type="input" name="auxiliar_funcionario_id_desc" id="auxiliar_funcionario_id_desc" value="" readonly="true" size="40" />'; 
    809         content += '<a href="javascript:void(0)" onclick="openParticipants(\'auxiliar_funcionario_id\', \'uid=1&hidegroups=1\');"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/add_user.png" /></a>'; 
     809        content += '<a href="javascript:void(0)" onclick="openParticipantsWindow(\'auxiliar_funcionario_id\', \'uid=1&hidegroups=1\');"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/add_user.png" /></a>'; 
    810810        content += ' <a href="javascript:void(0)" onclick="$(\'auxiliar_funcionario_id\').value=\'\'; $(\'auxiliar_funcionario_id_desc\').value=\'\'; return false;"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/delete_user.png" /></a>'; 
    811811        content += '</td></tr>'; 
    … …  
    882882        content += '<input type="hidden" name="substituto_funcionario_id" id="substituto_funcionario_id" value="" />'; 
    883883        content += '<input type="input" name="substituto_funcionario_id_desc" id="substituto_funcionario_id_desc" value="" readonly="true" size="40" />'; 
    884         content += '<a href="javascript:void(0)" onclick="openParticipants(\'substituto_funcionario_id\', \'uid=1&hidegroups=1\');"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/add_user.png" /></a>'; 
     884        content += '<a href="javascript:void(0)" onclick="openParticipantsWindow(\'substituto_funcionario_id\', \'uid=1&hidegroups=1\');"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/add_user.png" /></a>'; 
    885885        content += ' <a href="javascript:void(0)" onclick="$(\'substituto_funcionario_id\').value=\'\'; $(\'substituto_funcionario_id_desc\').value=\'\'; return false;"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/delete_user.png" /></a>'; 
    886886        content += '</td></tr>'; 

  • branches/2.5/workflow/setup/setup.inc.php

    r7516 r8232  
    1313        $setup_info['workflow']['name']                 = 'workflow'; 
    1414        $setup_info['workflow']['title']                = 'Workflow Management'; 
    15         $setup_info['workflow']['version']              = '2.5.0'; 
     15        $setup_info['workflow']['version']              = '2.5.1'; 
    1616        $setup_info['workflow']['app_order']    = 10; 
    1717        $setup_info['workflow']['enable']               = 1; 
    … …  
    5959        $setup_info['workflow']['depends'][] = array( 
    6060                'appname' => 'phpgwapi', 
    61                 'versions' => Array('1.2', '2.0', '2.2', '2.4', '2.5') 
     61                'versions' => Array('2.5.1.1') 
    6262        ); 
    6363        $setup_info['workflow']['depends'][] = array( 
    6464                'appname' => 'preferences', 
    65                 'versions' => Array('0.9.13.002', '2.0', '2.2', '2.5.0') 
     65                'versions' => Array('2.5.1') 
    6666        ); 
    6767?> 

  • branches/2.5/workflow/setup/tables_update.inc.php

    r7516 r8232  
    360360        return $GLOBALS['setup_info']['workflow']['currentver']; 
    361361    } 
    362         $test[] = '2.4.2'; 
    363         function workflow_upgrade2_4_2() 
    364         { 
    365                 $GLOBALS['setup_info']['workflow']['currentver'] = '2.5.0'; 
    366                 return $GLOBALS['setup_info']['workflow']['currentver']; 
    367         } 
     362 
     363    $test[] = '2.4.2'; 
     364    function workflow_upgrade2_4_2() 
     365    { 
     366        $GLOBALS['setup_info']['workflow']['currentver'] = '2.5.0'; 
     367        return $GLOBALS['setup_info']['workflow']['currentver']; 
     368    } 
     369 
     370    $test[] = '2.5.0'; 
     371    function workflow_upgrade2_5_0() 
     372    { 
     373        $GLOBALS['setup_info']['workflow']['currentver'] = '2.5.1'; 
     374        return $GLOBALS['setup_info']['workflow']['currentver']; 
     375    } 
    368376 
    369377 

  • branches/2.5/workflow/templates/default/admin_activities.tpl

    r1710 r8232  
    178178                        <div id="div_default_user_option_0" style="display:none;"> 
    179179                                <input type="input" name="default_user_desc" id="default_user_desc" value="{wf_default_user_desc}" readonly="true" size="40" /> 
    180                                 <a href="javascript:void(0)" onclick="openParticipants('default_user', 'uid=1&hidegroups=1');"><img border="0" src="workflow/templateFile.php?file=images/add_user.png" /></a> 
     180                                <a href="javascript:void(0)" onclick="openParticipantsWindow('default_user', 'uid=1&hidegroups=1');"><img border="0" src="workflow/templateFile.php?file=images/add_user.png" /></a> 
    181181                                <button onclick="document.getElementById('default_user_desc').value=''; document.getElementById('default_user').value='*'; return false">{lang_without_default_user}</button> 
    182182                                <br> 

  • branches/2.5/workflow/templates/default/admin_roles.tpl

    r795 r8232  
    123123                                </select> 
    124124                        </td><td valign=center align=center> 
    125                                 <a href='javascript:void(0)' onclick="openParticipants('user_list', 'entities=ug&usePreffix=1');"><img border=0 src={src_img_add_users}></a> 
     125                                <a href='javascript:void(0)' onclick="openParticipantsWindow('user_list', 'entities=ug&usePreffix=1');"><img border=0 src={src_img_add_users}></a> 
    126126                                <br> 
    127                                 <a href='javascript:void(0)' onclick="openParticipants('user_list', 'entities=ug&usePreffix=1');">{lang_Add}</a> 
     127                                <a href='javascript:void(0)' onclick="openParticipantsWindow('user_list', 'entities=ug&usePreffix=1');">{lang_Add}</a> 
    128128                                <br><br> 
    129129                                <a href="javascript:void(0)" onclick="participantsRemoveUser(document.getElementById('user_list'));"><img border=0 src={src_img_del_users}></a> 
Note: See TracChangeset for help on using the changeset viewer.