Changeset 2574 for branches/2.1
- Timestamp:
- 04/16/10 17:55:41 (14 years ago)
- Location:
- branches/2.1/workflow
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.1/workflow/doc/change_log.txt
r1712 r2574 23 23 #792 - Modificado o atribuito de usuário padrão de uma atividade para aceitar também um perfil padrão. (rufino) 24 24 #766 - Correção de bug na função wf_get_activity_link_by_id que impedia a geração do link caso não haja instância. (viani) 25 #671 - Inclusão do arquivo header.session.inc.php para a verificação de segurança de sessão. (asaikawa) 25 26 #668 - Modificada a expressão regular que busca por nomes no organograma, para considerar primeiro e último nome. (rodsouza) 26 27 #659 - Carregamento de valor nas variáveis smarty para os links de tarefas pendentes e processos, no template padrão. (gbisotto) 27 28 #658 - Correção no alinhamento dos ícones de aplicações externas. Ao redimensionar a janela, o ícones são reorganizados. (gbisotto) 28 29 #657 - Correção no alinhamento do menu de atividades dos processos. Ao redimensionar a janela, os menus são reorganizados. (gbisotto). 30 #643 - Criação do método createNewInstance na classe JobBase, que possibilita iniciar uma instância do processo a partir de um job. (rufino) 29 31 #639 - Inclusão de cor em destaque ao passar o mouse sobre uma linha nas visualizações do organograma. (rodsouza) 30 32 #638 - Mudança na query de busca do organograma para pesquisar também por áreas. (rodsouza) 31 #6 43 - Criação do método createNewInstance na classe JobBase, que possibilita iniciar uma instância do processo a partir de um job. (rufino)33 #637 - Inclusão de click-to-call no organograma e outras melhorias na interface. (rodsouza) 32 34 #442 - Criação do plugin wf_autocomplete_input, para listar com autocomplete o resultado de uma busca ajax. (rufino) 33 #637 - Inclusão de click-to-call no organograma e outras melhorias na interface. (rodsouza)34 35 35 36 [2.0.000] -
branches/2.1/workflow/setup/default_records.inc.php
r1978 r2574 19 19 'dbname' => $GLOBALS['phpgw']->ADOdb->database, 20 20 'host' => $GLOBALS['phpgw']->ADOdb->host, 21 'port' => $GLOBALS['phpgw']->ADOdb->port, 21 22 'user' => $GLOBALS['phpgw']->ADOdb->user, 22 23 'password' => $GLOBALS['phpgw']->ADOdb->password); … … 33 34 } 34 35 } 36 35 37 if (($workflowHostInfo['password']{0} == "'") && ($workflowHostInfo['password']{strlen($workflowHostInfo['password'])-1} == "'")) 36 38 $workflowHostInfo['password'] = substr($workflowHostInfo['password'], 1, strlen($workflowHostInfo['password']) - 2); 37 39 38 40 /* connect to the egroupware database */ 39 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);41 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 40 42 41 43 /* create the workflow database */ … … 61 63 /* connect to the new database */ 62 64 $workflowDB = $GLOBALS['phpgw']->ADOdb; 63 if ($workflowDB->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow'))65 if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 64 66 { 65 67 /* create a sample application (Music CD Loan) */ … … 135 137 136 138 /* reconnect to the previous database */ 137 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);139 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 138 140 139 141 ?> -
branches/2.1/workflow/setup/tables_update.inc.php
r1978 r2574 20 20 'dbname' => $GLOBALS['phpgw']->ADOdb->database, 21 21 'host' => $GLOBALS['phpgw']->ADOdb->host, 22 'port' => $GLOBALS['phpgw']->ADOdb->port, 22 23 'user' => $GLOBALS['phpgw']->ADOdb->user, 23 24 'password' => $GLOBALS['phpgw']->ADOdb->password); … … 415 416 /* connect to the new database */ 416 417 $workflowDB = $GLOBALS['phpgw']->ADOdb; 417 if ($workflowDB->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow'))418 if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 418 419 { 419 420 /* create a sample application (Music CD Loan) */ … … 482 483 483 484 /* reconnect to the previous database */ 484 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);485 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 485 486 } 486 487 … … 514 515 /* connect to the workflow database */ 515 516 $workflowDB = $GLOBALS['phpgw']->ADOdb; 516 if ($workflowDB->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow'))517 if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 517 518 { 518 519 /* change the type of the employee ID (funcionario_id field) */ … … 538 539 539 540 /* reconnect to the previous database */ 540 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);541 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 541 542 } 542 543 … … 573 574 /* connect to the new database */ 574 575 $workflowDB = $GLOBALS['phpgw']->ADOdb; 575 if ($workflowDB->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow'))576 if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 576 577 { 577 578 /* add a new column to the area table (orgchart) */ … … 581 582 582 583 /* reconnect to the previous database */ 583 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);584 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 584 585 } 585 586 … … 638 639 /* connect to the Workflow database */ 639 640 $workflowDB = $GLOBALS['phpgw']->ADOdb; 640 if ($workflowDB->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow'))641 if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 641 642 { 642 643 $result = $GLOBALS['phpgw']->ADOdb->query('SELECT admin_access_id, tipo, numvalue, nivel FROM admin_access'); … … 668 669 669 670 /* reconnect to the previous database */ 670 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);671 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 671 672 foreach ($adminAccessData as $newRow) 672 673 $result = $GLOBALS['phpgw']->ADOdb->query("INSERT INTO egw_wf_admin_access(admin_access_id, tipo, numvalue, nivel) VALUES (?, ?, ?, ?)", $newRow); … … 694 695 /* connect to the new database */ 695 696 $workflowDB = $GLOBALS['phpgw']->ADOdb; 696 if ($workflowDB->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow'))697 if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 697 698 { 698 699 /* add a new column to the funcionario_status table (orgchart) */ … … 703 704 704 705 /* reconnect to the previous database */ 705 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);706 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 706 707 } 707 708 … … 738 739 /* connect to the new database */ 739 740 $workflowDB = $GLOBALS['phpgw']->ADOdb; 740 if ($workflowDB->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow'))741 if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 741 742 { 742 743 /* add a new column to the organizacao table (orgchart) */ … … 745 746 746 747 /* reconnect to the previous database */ 747 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);748 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 748 749 } 749 750 … … 780 781 /* connect to the new database */ 781 782 $workflowDB = $GLOBALS['phpgw']->ADOdb; 782 if ($workflowDB->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow'))783 if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 783 784 { 784 785 /* create the new tables and add the referencial constraints */ … … 808 809 809 810 /* reconnect to the previous database */ 810 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);811 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 811 812 } 812 813 … … 933 934 /* connect to the new database */ 934 935 $workflowDB = $GLOBALS['phpgw']->ADOdb; 935 if ($workflowDB->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow'))936 if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 936 937 { 937 938 $result = $workflowDB->query("SELECT 1 FROM pg_tables WHERE (schemaname = 'public') AND (tablename = 'funcionario_status')"); … … 957 958 } 958 959 /* reconnect to the previous database */ 959 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);960 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 960 961 } 961 962 … … 1039 1040 /* connect to the new database */ 1040 1041 $workflowDB = $GLOBALS['phpgw']->ADOdb; 1041 if ($workflowDB->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow'))1042 if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 1042 1043 { 1043 1044 /* add a new column to the area organization (orgchart) */ … … 1048 1049 1049 1050 /* reconnect to the previous database */ 1050 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);1051 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 1051 1052 } 1052 1053 … … 1065 1066 /* connect to the new database */ 1066 1067 $workflowDB = $GLOBALS['phpgw']->ADOdb; 1067 if ($workflowDB->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow'))1068 if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 1068 1069 { 1069 1070 /* gather some information */ … … 1109 1110 1110 1111 /* reconnect to the previous database */ 1111 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);1112 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 1112 1113 } 1113 1114 … … 1157 1158 /* connect to workflow database */ 1158 1159 $workflowDB = $GLOBALS['phpgw']->ADOdb; 1159 if ($workflowDB->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow'))1160 if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 1160 1161 { 1161 1162 /* add the new columns */ … … 1183 1184 1184 1185 /* reconnect to the previous database */ 1185 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'] , $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']);1186 $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 1186 1187 } 1187 1188 #updating the current version … … 1215 1216 { 1216 1217 #updating the current version 1218 $GLOBALS['setup_info']['workflow']['currentver'] = '2.0.003'; 1219 return $GLOBALS['setup_info']['workflow']['currentver']; 1220 } 1221 $test[] = '2.0.003'; 1222 function workflow_upgrade2_0_003() 1223 { 1224 #updating the current version 1225 $GLOBALS['setup_info']['workflow']['currentver'] = '2.0.004'; 1226 return $GLOBALS['setup_info']['workflow']['currentver']; 1227 } 1228 $test[] = '2.0.004'; 1229 function workflow_upgrade2_0_004() 1230 { 1231 #updating the current version 1217 1232 $GLOBALS['setup_info']['workflow']['currentver'] = '2.1.000'; 1218 1233 return $GLOBALS['setup_info']['workflow']['currentver'];
Note: See TracChangeset
for help on using the changeset viewer.