fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in release/3.2.2 (pull request #6069)

Browse Source 
Updating branch release/3.2.3 with the last changes made on branch release/3.2.2 (second PR)

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Julio Cesar Laura Avendaño
2017-09-19 16:09:20 +00:00
parent d5c8707fcf 56d26a878d
commit 3605a634e7
5 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/config/schema.xml
View File

@@ -300,6 +300,12 @@
<index name="indexAppUid">
<index-column name="APP_UID"/>
</index>
<index name="indexAppUidDocUidDocVersionDocType">
<index-column name="APP_UID"/>
<index-column name="DOC_UID"/>
<index-column name="DOC_VERSION"/>
<index-column name="APP_DOC_TYPE"/>
</index>
</table>
<table name="APP_MESSAGE" idMethod="native">
<vendor type="mysql">
@@ -343,6 +349,9 @@
<index name="indexForAppUid">
<index-column name="APP_UID"/>
</index>
<index name="indexForMsgStatus">
<index-column name="APP_MSG_STATUS"/>
</index>
</table>
<table name="APP_OWNER">
<vendor type="mysql">

6
workflow/engine/data/mysql/schema.sql
View File

@@ -133,7 +133,8 @@ CREATE TABLE `APP_DOCUMENT`
`SYNC_PERMISSIONS` MEDIUMTEXT,
PRIMARY KEY (`APP_DOC_UID`,`DOC_VERSION`),
KEY `indexAppDocument`(`FOLDER_UID`, `APP_DOC_UID`),
KEY `indexAppUid`(`APP_UID`)
KEY `indexAppUid`(`APP_UID`),
KEY `indexAppUidDocUidDocVersionDocType`(`APP_UID`, `DOC_UID`, `DOC_VERSION`, `APP_DOC_TYPE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Documents in an Application';
#-----------------------------------------------------------------------------
#-- APP_MESSAGE
@@ -163,7 +164,8 @@ CREATE TABLE `APP_MESSAGE`
`APP_MSG_SHOW_MESSAGE` TINYINT default 1 NOT NULL,
`APP_MSG_ERROR` MEDIUMTEXT,
PRIMARY KEY (`APP_MSG_UID`),
KEY `indexForAppUid`(`APP_UID`)
KEY `indexForAppUid`(`APP_UID`),
KEY `indexForMsgStatus`(`APP_MSG_STATUS`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Messages in an Application';
#-----------------------------------------------------------------------------
#-- APP_OWNER

17
workflow/engine/methods/cases/cases_Step.php
View File

@@ -1095,6 +1095,7 @@ try {
$currentTask = $aFields['TASK'][1];
$isWebEntry = $bmWebEntry->isTaskAWebEntry($currentTask['TAS_UID']);
if ($isWebEntry) {
$webEntryUrlEvaluated = '';
$tplFile = 'webentry/cases_ScreenDerivation';
$caseId = $currentTask['APP_UID'];
$delIndex = $currentTask['DEL_INDEX'];
@@ -1112,22 +1113,6 @@ try {
}
$G_PUBLISH->AddContent( 'smarty', $tplFile, '', '', $aFields );
/*
if (isset( $aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED'])){
if($aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED']!="ERROR" && is_array($aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED'])){
$G_PUBLISH->AddContent('smarty', 'cases/cases_ScreenDerivation', '', '', $aFields);
} else {
$sMessageError = "The current user does not have a valid Reports To user. Please contact administrator.";
//$aFields['TASK'][$sKey]['NEXT_TASK']['USR_HIDDEN_FIELD'] = '<input type="hidden" name="' . $hiddenName . '" id="' . $hiddenName . '" value="' . $sMessageError . '">';
G::SendTemporalMessage ('UID_UNDEFINED_USER', "Error");
$aFields['ERROR_REPORTSTO']= "Error";
$aFields['MESSAGE_ERROR_REPORTSTO']=G::loadTranslation("ID_MSJ_REPORSTO");;
$G_PUBLISH->AddContent('smarty', 'cases/cases_ShowE_Reportsto', '', '', $aFields);
}
} else {
$G_PUBLISH->AddContent('smarty', 'cases/cases_ScreenDerivation', '', '', $aFields);
}
*/
break;
case 'EXTERNAL':
if ($noShowTitle == 0) {

76
workflow/engine/templates/users/usersList.js
View File

@@ -1,7 +1,5 @@
/*
* @author: Qennix
* Jan 24th, 2011
*/
//Keyboard Events
new Ext.KeyMap(document, [
@@ -65,59 +63,59 @@ Ext.onReady(function(){
pageSize = parseInt(CONFIG.pageSize);
newButton = new Ext.Action({
text: _('ID_NEW'),
iconCls: 'button_menu_ext ss_sprite ss_add',
handler: NewUserAction
text: _('ID_NEW'),
iconCls: 'button_menu_ext ss_sprite ss_add',
id: 'usersBtnNew',
handler: NewUserAction
});
summaryButton = new Ext.Action({
text: _('ID_SUMMARY'),
iconCls: 'button_menu_ext ss_sprite ss_table',
handler: SummaryTabOpen,
disabled: true
text: _('ID_SUMMARY'),
id: 'usersBtnSummary',
iconCls: 'button_menu_ext ss_sprite ss_table',
handler: SummaryTabOpen,
disabled: true
});
editButton = new Ext.Action({
text: _('ID_EDIT'),
iconCls: 'button_menu_ext ss_sprite ss_pencil',
handler: EditUserAction,
disabled: true
text: _('ID_EDIT'),
id: 'usersBtnEdit',
iconCls: 'button_menu_ext ss_sprite ss_pencil',
handler: EditUserAction,
disabled: true
});
changeStatusButton = new Ext.Button({
text: _('ID_STATUS'),
icon: '',
iconCls: 'silk-add',
handler: changeStatusCheck,
disabled: true
text: _('ID_STATUS'),
id: 'usersBtnStatus',
icon: '',
iconCls: 'silk-add',
handler: changeStatusCheck,
disabled: true
});
deleteButton = new Ext.Action({
text: _('ID_DELETE'),
iconCls: 'button_menu_ext ss_sprite ss_delete',
handler: DeleteUserAction,
disabled: true
text: _('ID_DELETE'),
id: 'usersBtnDelete',
iconCls: 'button_menu_ext ss_sprite ss_delete',
handler: DeleteUserAction,
disabled: true
});
groupsButton = new Ext.Action({
text: _('ID_GROUPS'),
iconCls: 'button_menu_ext ss_sprite ss_group_add',
handler: UsersGroupPage,
disabled: true
text: _('ID_GROUPS'),
id: 'usersBtnGroups',
iconCls: 'button_menu_ext ss_sprite ss_group_add',
handler: UsersGroupPage,
disabled: true
});
// reassignButton = new Ext.Action({
// text: _('ID_REASSIGN_CASES'),
// iconCls: 'button_menu_ext ss_sprite ss_arrow_rotate_clockwise',
// handler: DoNothing,
// disabled: true
// });
authenticationButton = new Ext.Action({
text: _('ID_AUTHENTICATION'),
iconCls: 'button_menu_ext ss_sprite ss_key',
handler: AuthUserPage,
disabled: true
text: _('ID_AUTHENTICATION'),
id: 'usersBtnAuthentication',
iconCls: 'button_menu_ext ss_sprite ss_key',
handler: AuthUserPage,
disabled: true
});