diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 088614cd1..0e7de14eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ build_job: stage: build script: # Download fileManager - - bash docker/download_filemanager.sh "1.0.9" + - bash docker/download_filemanager.sh "1.0.10" - bash docker/build.sh $VERSION before_script: diff --git a/workflow/engine/classes/model/UsersProperties.php b/workflow/engine/classes/model/UsersProperties.php index 33ce4517a..25d81a001 100644 --- a/workflow/engine/classes/model/UsersProperties.php +++ b/workflow/engine/classes/model/UsersProperties.php @@ -506,6 +506,7 @@ class UsersProperties extends BaseUsersProperties $url = 'setup/main'; } break; +/* case 'PM_DASHBOARD': if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) { $url = 'dashboard/main'; @@ -516,6 +517,7 @@ class UsersProperties extends BaseUsersProperties $url = 'strategicDashboard/main'; } break; +*/ } } diff --git a/workflow/engine/menus/processmaker.php b/workflow/engine/menus/processmaker.php index 065549c67..403b26fc8 100644 --- a/workflow/engine/menus/processmaker.php +++ b/workflow/engine/menus/processmaker.php @@ -18,6 +18,7 @@ if ($RBAC->userCanAccess('PM_FACTORY') == 1) { $G_TMP_MENU->AddIdRawOption('PROCESSES', 'processes/main', G::LoadTranslation('ID_DESIGNER'), '', '', '', 'x-pm-designer'); } +/* // DASHBOARD MODULE if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) { $G_TMP_MENU->AddIdRawOption('DASHBOARD', 'dashboard/main', G::LoadTranslation('ID_DASHBOARD'), '', '', '', 'x-pm-dashboard'); @@ -26,6 +27,7 @@ if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) { if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) { $G_TMP_MENU->AddIdRawOption('DASHBOARD+', 'strategicDashboard/main', G::LoadTranslation('ID_STRATEGIC_DASHBOARD'), '', '', '', 'x-pm-dashboard'); } +*/ // ADMIN MODULE if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1) { diff --git a/workflow/engine/menus/setup.php b/workflow/engine/menus/setup.php index 8e5258824..66a7211df 100755 --- a/workflow/engine/menus/setup.php +++ b/workflow/engine/menus/setup.php @@ -113,6 +113,7 @@ if ($RBAC->userCanAccess('PM_SETUP') === 1) { 'settings' ); } + /* if ($RBAC->userCanAccess('PM_SETUP_DASHBOARDS') === 1) { $G_TMP_MENU->AddIdRawOption( 'DASHBOARD', @@ -131,6 +132,7 @@ if ($RBAC->userCanAccess('PM_SETUP') === 1) { 'settings' ); } + */ } //tools options if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') === 1) {