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

Merged in bugfix/PMC-849 (pull request #6936)

Browse Source 
PMC-849

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2019-06-18 12:16:48 +00:00
committed by Julio Cesar Laura Avendaño
parent 34aa0a99db 782aece22c
commit b5e61179b6
3 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -23660,8 +23660,8 @@ msgstr "Setting SUPER privilege"
# TRANSLATION # TRANSLATION
# LABEL/ID_SETUP # LABEL/ID_SETUP
#: LABEL/ID_SETUP #: LABEL/ID_SETUP
msgid "ADMIN" msgid "Admin"
msgstr "ADMIN" msgstr "Admin"
# TRANSLATION # TRANSLATION
# LABEL/ID_SETUP_MAILCONF_TITLE # LABEL/ID_SETUP_MAILCONF_TITLE

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

@@ -60832,7 +60832,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_SETTINGS_HEARTBEAT_TITLE','en','Display Setting','2014-01-15') , ( 'LABEL','ID_SETTINGS_HEARTBEAT_TITLE','en','Display Setting','2014-01-15') ,
( 'LABEL','ID_SETTING_MESSAGE','en','The Settings tool was clicked','2014-01-15') , ( 'LABEL','ID_SETTING_MESSAGE','en','The Settings tool was clicked','2014-01-15') ,
( 'LABEL','ID_SETTING_SUPER','en','Setting SUPER privilege','2014-01-28') , ( 'LABEL','ID_SETTING_SUPER','en','Setting SUPER privilege','2014-01-28') ,
( 'LABEL','ID_SETUP','en','ADMIN','2014-01-15') , ( 'LABEL','ID_SETUP','en','Admin','2014-01-15') ,
( 'LABEL','ID_SETUP_MAILCONF_TITLE','en','Test SMTP Connection','2014-01-15') , ( 'LABEL','ID_SETUP_MAILCONF_TITLE','en','Test SMTP Connection','2014-01-15') ,
( 'LABEL','ID_SETUP_WEBSERVICES','en','Setup','2014-01-15') , ( 'LABEL','ID_SETUP_WEBSERVICES','en','Setup','2014-01-15') ,
( 'LABEL','ID_SET_A_TABLE_NAME','en','Set a Table Name','2014-01-15') , ( 'LABEL','ID_SET_A_TABLE_NAME','en','Set a Table Name','2014-01-15') ,

27
workflow/engine/menus/processmaker.php
View File

@@ -2,32 +2,9 @@
/** /**
* processmaker.php * processmaker.php
* *
* ProcessMaker Open Source Edition * ProcessMaker main menu
* Copyright (C) 2004 - 2008 Colosa Inc.23
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/ */
/*************************************
* ---= Processmaker main menu=---
*************************************/
global $G_TMP_MENU; global $G_TMP_MENU;
global $RBAC; global $RBAC;
@@ -57,7 +34,7 @@ if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
// ADMIN MODULE // ADMIN MODULE
if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1) { if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1) {
$G_TMP_MENU->AddIdRawOption('SETUP', 'setup/main', strtolower(G::LoadTranslation('ID_SETUP')), '', '', '', 'x-pm-setup'); $G_TMP_MENU->AddIdRawOption('SETUP', 'setup/main', G::LoadTranslation('ID_SETUP'), '', '', '', 'x-pm-setup');
} }