fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/HOR-2880 (pull request #5571)

Browse Source 
HOR-2880

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2017-05-05 20:25:37 +00:00
committed by Julio Cesar Laura Avendaño
parent 7f8e318da8 ca9d3d30e1
commit 0af1a4ddf0
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/data/mysql/insert.sql
View File

@@ -68,7 +68,8 @@ INSERT INTO CONTENT (CON_CATEGORY,CON_PARENT,CON_ID,CON_LANG,CON_VALUE) VALUES
('PER_NAME','','00000000000000000000000000000061','en','Edit User profile Photo'),
('PER_NAME','','00000000000000000000000000000062','en','Edit User profile Default Main Menu Options'),
('PER_NAME','','00000000000000000000000000000063','en','Edit User profile Default Cases Menu Options'),
('PER_NAME','','00000000000000000000000000000064','en','Reassign case supervisor');
('PER_NAME','','00000000000000000000000000000064','en','Reassign case supervisor'),
('PER_NAME','','00000000000000000000000000000065','en','Setup Custom Cases List');
INSERT INTO LANGUAGE (LAN_ID,LAN_LOCATION,LAN_NAME,LAN_NATIVE_NAME,LAN_DIRECTION,LAN_WEIGHT,LAN_ENABLED,LAN_CALENDAR) VALUES
('aa','','Afar','','L','0','0','GREGORIAN'),

39
workflow/engine/menus/setup.php
View File

@@ -63,16 +63,6 @@ if ($RBAC->userCanAccess('PM_SETUP') === 1) {
}
}
if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') === 1) {
if ($RBAC->userCanAccess('PM_SETUP_LANGUAGE') === 1) {
$G_TMP_MENU->AddIdRawOption(
'LANGUAGES', 'languages',
G::LoadTranslation('ID_LANGUAGES'),
'icon-language.png','', 'settings'
);
}
}
if ($RBAC->userCanAccess('PM_SETUP') === 1) {
if ($RBAC->userCanAccess('PM_SETUP_SKIN') === 1) {
$G_TMP_MENU->AddIdRawOption(
@@ -103,14 +93,6 @@ if ($RBAC->userCanAccess('PM_SETUP') === 1) {
}
}
if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') === 1) {
$G_TMP_MENU->AddIdRawOption(
'APPCACHEVIEW_SETUP', '../setup/appCacheViewConf',
G::LoadTranslation('ID_APPCACHE_SETUP'),
"", '', 'settings'
);
}
if ($RBAC->userCanAccess('PM_SETUP') === 1) {
if ($RBAC->userCanAccess('PM_SETUP_CLEAR_CACHE') === 1) {
$G_TMP_MENU->AddIdRawOption(
@@ -159,6 +141,20 @@ if ($RBAC->userCanAccess('PM_SETUP') === 1) {
}
//tools options
if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') === 1) {
if ($RBAC->userCanAccess('PM_SETUP_LANGUAGE') === 1) {
$G_TMP_MENU->AddIdRawOption(
'LANGUAGES', 'languages',
G::LoadTranslation('ID_LANGUAGES'),
'icon-language.png','', 'settings'
);
}
if ($RBAC->userCanAccess('PM_SETUP_CASES_LIST_CACHE_BUILDER') === 1) {
$G_TMP_MENU->AddIdRawOption(
'APPCACHEVIEW_SETUP', '../setup/appCacheViewConf',
G::LoadTranslation('ID_APPCACHE_SETUP'),
"", '', 'settings'
);
}
if (!$partnerFlag) {
if ($RBAC->userCanAccess('PM_SETUP_PLUGINS') === 1) {
$G_TMP_MENU->AddIdRawOption(
@@ -277,12 +273,7 @@ if ($licenseStatusInfo["message"] != "") {
/*----------------------------------********---------------------------------*/
if ($RBAC->userCanAccess('PM_SETUP') == 1) {
/*----------------------------------********---------------------------------*/
if ($RBAC->userCanAccess('PM_SETUP_CASES_LIST_CACHE_BUILDER') == 1) {
$G_TMP_MENU->AddIdRawOption(
'PMENTERPRISE', '../enterprise/addonsStore',
G::LoadTranslation('ID_MENU_NAME') .$licStatusMsg,
'', '', 'plugins'
);
if ($RBAC->userCanAccess('PM_SETUP_CUSTOM_CASES_LIST') == 1) {
$G_TMP_MENU->AddIdRawOption(
'CASES_LIST_SETUP', '../cases/casesListSetup',
G::LoadTranslation('ID_CUSTOM_CASES_LISTS'),