fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master' into PM-1655

Browse Source
This commit is contained in:
rodrigo quelca
2015-07-07 16:20:18 -04:00
parent d73df854b0 fdd9dbde45
commit a031a68a6d
15 changed files with 264 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/templates/cases/casesStartCase.js
View File

@@ -6,8 +6,12 @@ Ext.FlashComponent.EXPRESS_INSTALL_URL = '/images/expressinstall.swf';
// The Quicktips are used for the toolbar and Tree mouseover tooltips!
// Refresh treePanel
if (typeof(parent.timer) != 'undefined') {
parent.timer();
try {
if (typeof(parent.timer) != 'undefined') {
parent.timer();
}
} catch(theError) {
// This try-catch is for Zimbra error
}

2
workflow/engine/templates/roles/rolesUsersPermission.js
View File

@@ -229,7 +229,7 @@ Ext.onReady(function(){
columns: [
{id:'PER_UID', dataIndex: 'PER_UID', hidden:true, hideable:false},
{header: _('ID_PERMISSION_CODE'), dataIndex: 'PER_CODE', width: 60, align:'left', hidden: !PARTNER_FLAG ? false : true},
{header: _('ID_PERMISSION_NAME'), dataIndex: 'PER_NAME', width: 60, align:'left'}
{header: _('ID_PERMISSION_NAME'), dataIndex: 'PER_NAME', width: 59, align:'left'}
]
});