From ab39cc48b0c97af59d16f7d5922d7faa039621d3 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 4 Sep 2013 11:51:37 -0400 Subject: [PATCH 01/12] BUG-12710 Message history does not display the sent email when... SOLVED - No se visualizan los message history aunque se tengan los permisos. - se hallo una doble validacion y se elimino. - Se adicion la verificacion por grupos en el message history. --- workflow/engine/classes/class.case.php | 40 +++++++++++++++++++ .../methods/cases/caseMessageHistory_Ajax.php | 8 +--- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 0ee4cde86..aeb185f1d 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -5290,6 +5290,7 @@ class Cases $oCriteria = new Criteria('workflow'); + //Users $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID); $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID); if ($aCase['APP_STATUS'] != 'COMPLETED') { @@ -5299,6 +5300,26 @@ class Cases } $oCriteria->add(AppDelegationPeer::USR_UID, $USER); + $oDataset = AppDelegationPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $oDataset->next(); + while ($aRow = $oDataset->getRow()) { + $delIndex[] = $aRow['DEL_INDEX']; + $oDataset->next(); + } + + //Groups + $oCriteria = new Criteria('workflow'); + $oCriteria->addJoin(GroupUserPeer::USR_UID, AppDelegationPeer::USR_UID, Criteria::LEFT_JOIN); + $oCriteria->add(GroupUserPeer::GRP_UID, $USER); + $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID); + $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID); + if ($aCase['APP_STATUS'] != 'COMPLETED') { + if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) { + $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE); + } + } + $oDataset = AppDelegationPeer::doSelectRS($oCriteria); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); @@ -5434,6 +5455,25 @@ class Cases $oDataset->next(); } + //Groups + $oCriteria = new Criteria('workflow'); + $oCriteria->addJoin(GroupUserPeer::USR_UID, AppDelegationPeer::USR_UID, Criteria::LEFT_JOIN); + $oCriteria->add(GroupUserPeer::GRP_UID, $USER); + $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID); + $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID); + if ($aCase['APP_STATUS'] != 'COMPLETED') { + if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) { + $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE); + } + } + $oDataset = AppDelegationPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $oDataset->next(); + while ($aRow = $oDataset->getRow()) { + $delIndex[] = $aRow['DEL_INDEX']; + $oDataset->next(); + } + $RESULT['MSGS_HISTORY'] = array_merge(array('DEL_INDEX' => $delIndex), $RESULT['MSGS_HISTORY']); } break; diff --git a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php index c5170fb42..ca860287a 100755 --- a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php +++ b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php @@ -42,7 +42,6 @@ if ($actionAjax == 'messageHistoryGridList_JXP') { $appMessageArray = $oCase->getHistoryMessagesTrackerExt( $_SESSION['APPLICATION'], true, $_REQUEST['start'], $_REQUEST['limit']); $appMessageCountArray = $oCase->getHistoryMessagesTrackerExt( $_SESSION['APPLICATION'], true); - $result = new stdClass(); $aProcesses = Array (); @@ -61,7 +60,6 @@ if ($actionAjax == 'messageHistoryGridList_JXP') { if (count($respBlock["MSGS_HISTORY"]) > 0) { $respMess = $respBlock["MSGS_HISTORY"]["PERMISSION"]; - if (isset($respBlock["MSGS_HISTORY"]["DEL_INDEX"])) { $delIndex = $respBlock["MSGS_HISTORY"]["DEL_INDEX"]; } @@ -69,7 +67,6 @@ if ($actionAjax == 'messageHistoryGridList_JXP') { if (count($respView["MSGS_HISTORY"]) > 0) { $respMess = $respView["MSGS_HISTORY"]["PERMISSION"]; - if (isset($respView["MSGS_HISTORY"]["DEL_INDEX"])) { $delIndex = $respView["MSGS_HISTORY"]["DEL_INDEX"]; } @@ -77,9 +74,8 @@ if ($actionAjax == 'messageHistoryGridList_JXP') { if (count($respResend["MSGS_HISTORY"]) > 0) { $respMess = $respResend["MSGS_HISTORY"]["PERMISSION"]; - - if (isset($respBlock["MSGS_HISTORY"]["DEL_INDEX"])) { - $delIndex = $respBlock["MSGS_HISTORY"]["DEL_INDEX"]; + if (isset($respResend["MSGS_HISTORY"]["DEL_INDEX"])) { + $delIndex = $respResend["MSGS_HISTORY"]["DEL_INDEX"]; } } From 56920a779d05a854a9e59b197652e84bcfbe83ff Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 4 Sep 2013 17:02:29 -0400 Subject: [PATCH 02/12] BUG-12710 Message history does not display the sent email when... SOLVED - No se visualizan los message history aunque se tengan los permisos. - se hallo una doble validacion y se elimino. - Se adicion la verificacion por grupos en el message history. --- workflow/engine/classes/class.case.php | 132 ++++++++++++------------- 1 file changed, 64 insertions(+), 68 deletions(-) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index aeb185f1d..361f75adf 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -5289,46 +5289,45 @@ class Cases $delIndex = array(); $oCriteria = new Criteria('workflow'); - - //Users - $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID); - $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID); - if ($aCase['APP_STATUS'] != 'COMPLETED') { - if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) { - $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE); + if ($USER_RELATION == 1) { + //Users + $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID); + $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID); + if ($aCase['APP_STATUS'] != 'COMPLETED') { + if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) { + $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE); + } } - } - $oCriteria->add(AppDelegationPeer::USR_UID, $USER); + $oCriteria->add(AppDelegationPeer::USR_UID, $USER); - $oDataset = AppDelegationPeer::doSelectRS($oCriteria); - $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $oDataset->next(); - while ($aRow = $oDataset->getRow()) { - $delIndex[] = $aRow['DEL_INDEX']; + $oDataset = AppDelegationPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); - } - - //Groups - $oCriteria = new Criteria('workflow'); - $oCriteria->addJoin(GroupUserPeer::USR_UID, AppDelegationPeer::USR_UID, Criteria::LEFT_JOIN); - $oCriteria->add(GroupUserPeer::GRP_UID, $USER); - $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID); - $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID); - if ($aCase['APP_STATUS'] != 'COMPLETED') { - if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) { - $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE); + while ($aRow = $oDataset->getRow()) { + $delIndex[] = $aRow['DEL_INDEX']; + $oDataset->next(); + } + } else { + //Groups + $oCriteria->addJoin(GroupUserPeer::USR_UID, AppDelegationPeer::USR_UID, Criteria::LEFT_JOIN); + $oCriteria->add(GroupUserPeer::GRP_UID, $USER); + $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID); + $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID); + if ($aCase['APP_STATUS'] != 'COMPLETED') { + if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) { + $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE); + } } - } - $oDataset = AppDelegationPeer::doSelectRS($oCriteria); - $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $oDataset->next(); - while ($aRow = $oDataset->getRow()) { - $delIndex[] = $aRow['DEL_INDEX']; + $oDataset = AppDelegationPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); + while ($aRow = $oDataset->getRow()) { + $delIndex[] = $aRow['DEL_INDEX']; + $oDataset->next(); + } } $RESULT['MSGS_HISTORY'] = array_merge(array('DEL_INDEX' => $delIndex), $RESULT['MSGS_HISTORY']); - break; case 'DYNAFORM': $oCriteria = new Criteria('workflow'); @@ -5436,44 +5435,41 @@ class Cases $delIndex = array(); if ($TASK_SOURCE != "" && (int)$TASK_SOURCE != 0) { $oCriteria = new Criteria('workflow'); - - $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID); - $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID); - if ($aCase['APP_STATUS'] != 'COMPLETED') { - if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) { - $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE); + if ($USER_RELATION == 1) { + $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID); + $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID); + if ($aCase['APP_STATUS'] != 'COMPLETED') { + if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) { + $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE); + } + } + $oCriteria->add(AppDelegationPeer::USR_UID, $USER); + $oDataset = AppDelegationPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $oDataset->next(); + while ($aRow = $oDataset->getRow()) { + $delIndex[] = $aRow['DEL_INDEX']; + $oDataset->next(); + } + } else { + //Groups + $oCriteria->addJoin(GroupUserPeer::USR_UID, AppDelegationPeer::USR_UID, Criteria::LEFT_JOIN); + $oCriteria->add(GroupUserPeer::GRP_UID, $USER); + $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID); + $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID); + if ($aCase['APP_STATUS'] != 'COMPLETED') { + if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) { + $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE); + } + } + $oDataset = AppDelegationPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $oDataset->next(); + while ($aRow = $oDataset->getRow()) { + $delIndex[] = $aRow['DEL_INDEX']; + $oDataset->next(); } } - $oCriteria->add(AppDelegationPeer::USR_UID, $USER); - - $oDataset = AppDelegationPeer::doSelectRS($oCriteria); - $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $oDataset->next(); - - while ($aRow = $oDataset->getRow()) { - $delIndex[] = $aRow['DEL_INDEX']; - $oDataset->next(); - } - - //Groups - $oCriteria = new Criteria('workflow'); - $oCriteria->addJoin(GroupUserPeer::USR_UID, AppDelegationPeer::USR_UID, Criteria::LEFT_JOIN); - $oCriteria->add(GroupUserPeer::GRP_UID, $USER); - $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID); - $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID); - if ($aCase['APP_STATUS'] != 'COMPLETED') { - if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) { - $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE); - } - } - $oDataset = AppDelegationPeer::doSelectRS($oCriteria); - $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $oDataset->next(); - while ($aRow = $oDataset->getRow()) { - $delIndex[] = $aRow['DEL_INDEX']; - $oDataset->next(); - } - $RESULT['MSGS_HISTORY'] = array_merge(array('DEL_INDEX' => $delIndex), $RESULT['MSGS_HISTORY']); } break; From 530e609f3b5e1ed6cbadccf03db206e2941a72f5 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 5 Sep 2013 11:12:36 -0400 Subject: [PATCH 03/12] Arreglo de label --- workflow/engine/templates/pmTables/editReport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js index 3da3523d4..276f386cc 100755 --- a/workflow/engine/templates/pmTables/editReport.js +++ b/workflow/engine/templates/pmTables/editReport.js @@ -135,7 +135,7 @@ Ext.onReady(function(){ pageSize: pageSize, store: storeA, displayInfo: true, - displayMsg: '{0} - {1} of {2}', + displayMsg: '{0} - {1} ' + _('ID_DISPLAY_OF') + ' {2}', emptyMsg: _('ID_NO_RECORDS')/*, items: ['-',_('ID_PAGE_SIZE')+':',comboPageSize]*/ }); From 499da6b344f3f5ac8ed7eb71950f656960acaca7 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 5 Sep 2013 11:26:20 -0400 Subject: [PATCH 04/12] Arreglo de labels harcodeados --- workflow/engine/classes/class.processMap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 34b8f2b6f..6bce55528 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -950,8 +950,8 @@ class processMap $aRow['DYN_TITLE'] = Content::Load("DYN_TITLE", "", $aRow['DYN_UID'], SYS_LANG); } $aBB[] = array('STEP_UID' => $aRow['DYN_UID'], 'STEP_TITLE' => $aRow['DYN_TITLE'], 'STEP_TYPE_OBJ' => 'DYNAFORM', 'STEP_MODE' => '' ); $oDataset->next(); From a48c1cad6093ef376c65f304f032babfd14cec6a Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Thu, 5 Sep 2013 11:41:29 -0400 Subject: [PATCH 05/12] BUG 12850 "En la informacion sobre PHP en admin->Settings..." SOLVED - En ADMIN>Settings>PHPInformation, la licencia esta visible - Problema resuelto, se ha quitado la informacion de la licencia de PHP, para que no se tenga confusion con el idioma --- workflow/engine/methods/setup/systemInfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/methods/setup/systemInfo.php b/workflow/engine/methods/setup/systemInfo.php index 20926f253..8b030a618 100644 --- a/workflow/engine/methods/setup/systemInfo.php +++ b/workflow/engine/methods/setup/systemInfo.php @@ -3,7 +3,7 @@ $option = (isset($_GET["option"]))? $_GET["option"] : null; switch ($option) { case "phpinfo": - phpinfo(); + phpinfo(INFO_GENERAL + INFO_CREDITS + INFO_CONFIGURATION + INFO_MODULES + INFO_ENVIRONMENT + INFO_VARIABLES); break; case "php": $oHeadPublisher = &headPublisher::getSingleton(); From 529bdfdc32d73362eff95e9dce2264e9869a68d5 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 5 Sep 2013 12:18:14 -0400 Subject: [PATCH 06/12] Arreglo de lables --- workflow/engine/classes/class.processMap.php | 2 +- workflow/engine/methods/events/eventsSetupGraph.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 6bce55528..04e394d65 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -4549,7 +4549,7 @@ class processMap { try { $oTask = new Task(); - $oNewTask->label = 'Sub-Process'; //G::LoadTranslation('ID_TASK'); + $oNewTask->label = G::LoadTranslation('ID_SUBPROCESS'); $oNewTask->uid = $oTask->create(array('PRO_UID' => $sProcessUID, 'TAS_TITLE' => $oNewTask->label, 'TAS_POSX' => $iX, 'TAS_POSY' => $iY, 'TAS_TYPE' => 'SUBPROCESS' )); //$oJSON = new Services_JSON(); diff --git a/workflow/engine/methods/events/eventsSetupGraph.php b/workflow/engine/methods/events/eventsSetupGraph.php index 00f57d2b0..3da2a7356 100755 --- a/workflow/engine/methods/events/eventsSetupGraph.php +++ b/workflow/engine/methods/events/eventsSetupGraph.php @@ -22,7 +22,7 @@ if ($s != 'a') { } //timeUnit -$timeunit = isset( $_GET['t'] ) ? $_GET['t'] : 'Days'; +$timeunit = isset( $_GET['t'] ) ? $_GET['t'] : G::LoadTranslation('ID_DAYS'); $timeunit = ucfirst( strtolower( $timeunit ) ); //estimated @@ -151,7 +151,7 @@ function drawTimerEvent ($im, $x1, $y1, $h) imageline( $im, 15, $h - 19, $w - 15, $h - 19, $red ); imageline( $im, $w - 23, $h - 23, $w - 15, $h - 19, $red ); imageline( $im, $w - 23, $h - 15, $w - 15, $h - 19, $red ); -imagestring( $im, 2, $w - 30, $h - 37, 'Days', $red ); +imagestring( $im, 2, $w - 30, $h - 37, G::LoadTranslation('ID_DAYS'), $red ); if ($estimated == 0) { $s = 'i'; From b47a98ee497d285e399265b3fc4c50c3aec1ae6d Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 5 Sep 2013 12:26:44 -0400 Subject: [PATCH 07/12] Arreglo de labels --- workflow/engine/classes/model/CalendarDefinition.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/workflow/engine/classes/model/CalendarDefinition.php b/workflow/engine/classes/model/CalendarDefinition.php index cea5801dc..37d3e29bf 100755 --- a/workflow/engine/classes/model/CalendarDefinition.php +++ b/workflow/engine/classes/model/CalendarDefinition.php @@ -106,10 +106,10 @@ class CalendarDefinition extends BaseCalendarDefinition $tr = CalendarDefinitionPeer::retrieveByPK( $CalendarUid ); $defaultCalendar['CALENDAR_UID'] = "00000000000000000000000000000001"; - $defaultCalendar['CALENDAR_NAME'] = "Default"; + $defaultCalendar['CALENDAR_NAME'] = G::LoadTranslation('ID_DEFAULT_CALENDAR'); $defaultCalendar['CALENDAR_CREATE_DATE'] = date( "Y-m-d" ); $defaultCalendar['CALENDAR_UPDATE_DATE'] = date( "Y-m-d" ); - $defaultCalendar['CALENDAR_DESCRIPTION'] = "Default"; + $defaultCalendar['CALENDAR_DESCRIPTION'] = G::LoadTranslation('ID_DEFAULT_CALENDAR'); $defaultCalendar['CALENDAR_STATUS'] = "ACTIVE"; $defaultCalendar['CALENDAR_WORK_DAYS'] = "1|2|3|4|5"; $defaultCalendar['CALENDAR_WORK_DAYS'] = explode( "|", "1|2|3|4|5" ); @@ -151,10 +151,10 @@ class CalendarDefinition extends BaseCalendarDefinition //if exists the row in the database propel will update it, otherwise will insert. $tr = CalendarDefinitionPeer::retrieveByPK( $CalendarUid ); $defaultCalendar['CALENDAR_UID'] = "00000000000000000000000000000001"; - $defaultCalendar['CALENDAR_NAME'] = "Default"; + $defaultCalendar['CALENDAR_NAME'] = G::LoadTranslation('ID_DEFAULT_CALENDAR'); $defaultCalendar['CALENDAR_CREATE_DATE'] = date( "Y-m-d" ); $defaultCalendar['CALENDAR_UPDATE_DATE'] = date( "Y-m-d" ); - $defaultCalendar['CALENDAR_DESCRIPTION'] = "Default"; + $defaultCalendar['CALENDAR_DESCRIPTION'] = G::LoadTranslation('ID_DEFAULT_CALENDAR'); $defaultCalendar['CALENDAR_STATUS'] = "ACTIVE"; $defaultCalendar['CALENDAR_WORK_DAYS'] = "1|2|3|4|5"; $defaultCalendar['CALENDAR_WORK_DAYS'] = explode( "|", "1|2|3|4|5" ); @@ -244,7 +244,7 @@ class CalendarDefinition extends BaseCalendarDefinition $defaultCalendars[] = '00000000000000000000000000000001'; if (in_array( $aData['CALENDAR_UID'], $defaultCalendars )) { $CalendarStatus = 'ACTIVE'; - $CalendarName = 'Default'; + $CalendarName = G::LoadTranslation('ID_DEFAULT_CALENDAR'); } $CalendarWorkDays = isset( $aData['CALENDAR_WORK_DAYS'] ) ? implode( "|", $aData['CALENDAR_WORK_DAYS'] ) : ""; From 4da18e133e039ad4ac00016909f997b4f5461c37 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Fri, 6 Sep 2013 14:38:25 -0400 Subject: [PATCH 08/12] BUG-12830 SOLVED --- workflow/engine/templates/setup/skinList.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js index 168c655d2..8ac02397f 100755 --- a/workflow/engine/templates/setup/skinList.js +++ b/workflow/engine/templates/setup/skinList.js @@ -130,7 +130,8 @@ Ext.onReady(function(){ listeners:{ rowselect: function(sm){ rowSelected = infoGrid.getSelectionModel().getSelected(); - if((rowSelected.data.SKIN_FOLDER_ID)&&((rowSelected.data.SKIN_FOLDER_ID!="classic"))){ + + if((rowSelected.data.SKIN_FOLDER_ID)&&(rowSelected.data.SKIN_FOLDER_ID!="classic")&&(rowSelected.data.SKIN_FOLDER_ID!="neoclassic")){ exportButton.enable(); if (rowSelected.data.SKIN_STATUS!='Inactive') { From fd2571fa33c5052763c61b813f85612b834e20ae Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Fri, 6 Sep 2013 15:02:10 -0400 Subject: [PATCH 09/12] BUG-12894 SOLVED --- workflow/engine/templates/setup/loginSettings.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/workflow/engine/templates/setup/loginSettings.js b/workflow/engine/templates/setup/loginSettings.js index f0093b107..a9b2e84cd 100755 --- a/workflow/engine/templates/setup/loginSettings.js +++ b/workflow/engine/templates/setup/loginSettings.js @@ -50,17 +50,6 @@ Ext.onReady(function(){ } } }, - { - name: 'virtualKeyboad', - xtype: 'checkbox', - checked: virtualKeyboad, - fieldLabel: _('ID_ENABLE_VIRTUAL_KEYBOARD'), - listeners:{ - check:function(){ - changeSettings(); - } - } - }, { xtype: 'panel', anchor: '100%', From 4e37c76be37e50fc1e97133356c071c6e9f6deb9 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Fri, 6 Sep 2013 15:28:46 -0400 Subject: [PATCH 10/12] BUG-12918 SOLVED --- workflow/engine/classes/model/AppCacheView.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php index 3bd59107b..2230df3a3 100755 --- a/workflow/engine/classes/model/AppCacheView.php +++ b/workflow/engine/classes/model/AppCacheView.php @@ -1244,11 +1244,11 @@ class AppCacheView extends BaseAppCacheView $sql = "SHOW TABLES"; $rs1 = $stmt->executeQuery($sql, ResultSet::FETCHMODE_NUM); $rs1->next(); - $found = G::LoadTranslation('ID_FALSE');//false; + $found = false; while (is_array($row = $rs1->getRow()) && !$found) { if (strtolower($row[0]) == 'app_cache_view') { - $found = G::LoadTranslation('ID_TRUE');//true; + $found = true; } $rs1->next(); @@ -1261,7 +1261,7 @@ class AppCacheView extends BaseAppCacheView $oCriteria = new Criteria('workflow'); $count = AppCacheViewPeer::doCount($oCriteria); } - + $found = $found ? G::LoadTranslation('ID_TRUE') : G::LoadTranslation('ID_FALSE'); return array('found' => $found, 'count' => $count); } From 4fa7b395d454d429cde6bcc271cf06a3b6d62ec8 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Fri, 6 Sep 2013 16:23:14 -0400 Subject: [PATCH 11/12] Arreglo de label --- workflow/engine/templates/setup/languages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/templates/setup/languages.js b/workflow/engine/templates/setup/languages.js index b439087e9..899cb2560 100755 --- a/workflow/engine/templates/setup/languages.js +++ b/workflow/engine/templates/setup/languages.js @@ -78,7 +78,7 @@ Ext.onReady(function(){ if(uploader.getForm().isValid()){ uploader.getForm().submit({ url: 'languages_Import', - waitTitle:'', + waitTitle:' ', waitMsg: _('ID_UPLOADING_TRANSLATION_FILE'), success: function(o, resp){ w.close(); From fc46da00a70ff914a80a148aada723829b31eec5 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Tue, 10 Sep 2013 10:31:08 -0400 Subject: [PATCH 12/12] BUG-12494 SOLVED --- gulliver/system/class.g.php | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 7a9601e74..62873a601 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -1747,33 +1747,36 @@ class G $arrayGrid = array_unique($arrayGrid); foreach ($arrayGrid as $index => $value) { - $grdName = $value; + if($value !== "") { + $grdName = $value; - $strContentAux1 = $strContentAux; - $strContentAux = null; + $strContentAux1 = $strContentAux; + $strContentAux = null; - $ereg = "/^(.*)@>" . $grdName . "(.*)@<" . $grdName . "(.*)$/"; + $ereg = "/^(.*)@>" . $grdName . "(.*)@<" . $grdName . "(.*)$/"; - while (preg_match($ereg, $strContentAux1, $arrayMatch2)) { - $strData = null; + while (preg_match($ereg, $strContentAux1, $arrayMatch2)) { + $strData = null; - if (isset($aFields[$grdName]) && is_array($aFields[$grdName])) { - foreach ($aFields[$grdName] as $aRow) { - foreach ($aRow as $sKey => $vValue) { - if (!is_array($vValue)) { - $aRow[$sKey] = nl2br($aRow[$sKey]); + if (isset($aFields[$grdName]) && is_array($aFields[$grdName])) { + foreach ($aFields[$grdName] as $aRow) { + foreach ($aRow as $sKey => $vValue) { + if (!is_array($vValue)) { + $aRow[$sKey] = nl2br($aRow[$sKey]); + } } - } - $strData = $strData . G::replaceDataField($arrayMatch2[2], $aRow); + $strData = $strData . G::replaceDataField($arrayMatch2[2], $aRow); + } } + + $strContentAux1 = $arrayMatch2[1]; + $strContentAux = $strData . $arrayMatch2[3] . $strContentAux; } - $strContentAux1 = $arrayMatch2[1]; - $strContentAux = $strData . $arrayMatch2[3] . $strContentAux; + $strContentAux = $strContentAux1 . $strContentAux; + } - - $strContentAux = $strContentAux1 . $strContentAux; } }