fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in gproly/processmaker/HOR-304 (pull request #3779)

Browse Source 
HOR-304
This commit is contained in:
Julio Cesar Laura Avendaño
2016-03-04 10:20:24 -04:00
parent f5388e7ac6 036be56253
commit 4632c19cc8
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/methods/users/usersInit.php
View File

@@ -11,6 +11,8 @@ if ($RBAC->userCanAccess( 'PM_EDITPERSONALINFO' ) == 1) { //he has permitions fo
} else { //he has not permitions for edit his profile, so just view mode will be displayed } else { //he has not permitions for edit his profile, so just view mode will be displayed
$canEdit = true; $canEdit = true;
} }
$canEditCalendar = $RBAC->userCanAccess('PM_EDITPERSONALINFO') == 1 &&
$RBAC->userCanAccess('PM_EDITPERSONALINFO_CALENDAR') == 1;
//calculating the max upload file size; //calculating the max upload file size;
$POST_MAX_SIZE = ini_get( 'post_max_size' ); $POST_MAX_SIZE = ini_get( 'post_max_size' );
@@ -43,6 +45,7 @@ $oHeadPublisher->assign( 'USR_UID', $aFields['USR_UID'] );
$oHeadPublisher->assign( 'infoMode', true ); $oHeadPublisher->assign( 'infoMode', true );
$oHeadPublisher->assign( 'EDITPROFILE', 1); $oHeadPublisher->assign( 'EDITPROFILE', 1);
$oHeadPublisher->assign( 'canEdit', $canEdit ); $oHeadPublisher->assign( 'canEdit', $canEdit );
$oHeadPublisher->assign('canEditCalendar', $canEditCalendar);
$oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' ); $oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' );
$oHeadPublisher->assign( 'MODE', '' ); $oHeadPublisher->assign( 'MODE', '' );
$oHeadPublisher->assign('SYSTEM_TIME_ZONE', $arraySystemConfiguration['time_zone']); $oHeadPublisher->assign('SYSTEM_TIME_ZONE', $arraySystemConfiguration['time_zone']);

3
workflow/engine/templates/users/users.js
View File

@@ -1156,6 +1156,9 @@ function editUser()
frmSumary.hide(); frmSumary.hide();
frmDetails.show(); frmDetails.show();
if (window.canEditCalendar === true) {
comboCalendar.setReadOnly(false);
}
} }
function validateUserName() { function validateUserName() {