fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
dheeyi
2015-04-08 09:10:30 -04:00
parent 225ece1886 63567186ba
commit 75ecaa9fcb
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.licensedFeatures.php
View File

@@ -76,7 +76,7 @@ class PMLicensedFeatures
$value = $padl->_decrypt($featureName);
if (is_array($value)) {
$trueValue = $value[0];
$value = $value[0];
}
$trueValue = $value;
$enable = in_array($trueValue, $licenseManager->licensedfeatures);

2
workflow/engine/classes/class.system.php
View File

@@ -930,7 +930,7 @@ class System
}
//#1067 - Invalid default value for int field
if (substr( $newField['Type'], 0, 3 ) == "int" && isset( $newField['Default'] ) && $newField['Default'] == '') {
if (substr( $newField['Type'], 0, 3 ) == "INT" && isset( $newField['Default'] ) && $newField['Default'] == '') {
$changeDefaultAttr = false;
}

2
workflow/engine/content/languages/translation.en
View File

File diff suppressed because one or more lines are too long

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

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ProcessMaker 3.0\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2015-04-06 16:20:16\n"
"PO-Revision-Date: 2015-04-07 17:56:03\n"
"Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n"
@@ -13258,8 +13258,8 @@ msgstr "Failure to do so could lead your ProcessMaker installation not functioni
# TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1
#: LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1
msgid "If any of these items is not supported (marked as No), then please take actions to correct them."
msgstr "If any of these items is not supported (marked as No), then please take actions to correct them."
msgid "If any of these items are not supported (marked as No), then please take actions to correct them."
msgstr "If any of these items are not supported (marked as No), then please take actions to correct them."
# TRANSLATION
# LABEL/ID_LDAP_OPTIONAL
@@ -14524,8 +14524,8 @@ msgstr "Check again"
# TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION
#: LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION
msgid "If any of these items is not supported (marked as No) then please take actions to correct them.<br />"
msgstr "If any of these items is not supported (marked as No) then please take actions to correct them.<br />"
msgid "If any of these items are not supported (marked as No), then please take actions to correct them.<br />"
msgstr "If any of these items are not supported (marked as No), then please take actions to correct them.<br />"
# TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2

4
workflow/engine/data/mssql/insert.sql
View File

@@ -5858,7 +5858,7 @@ SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP2_1','en','These se
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly.','2015-01-16'
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1','en','If any of these items is not supported (marked as No), then please take actions to correct them.','2015-01-16'
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1','en','If any of these items are not supported (marked as No), then please take actions to correct them.','2015-01-16'
UNION ALL
SELECT 'LABEL','ID_LDAP_OPTIONAL','en','LDAP is optional.','2014-01-15'
UNION ALL
@@ -6286,7 +6286,7 @@ SELECT 'LABEL','ID_CHECKING','en','Checking...','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_CHECK_AGAIN','en','Check again','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items is not supported (marked as No) then please take actions to correct them.<br />','2014-01-15'
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No) then please take actions to correct them.<br />','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly!<br />','2015-01-16'
UNION ALL

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

@@ -3651,7 +3651,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP2_2','en','However, ProcessMaker still operates if your settings do not match the recommended.','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP2_1','en','These settings are recommended for PHP in order to ensure full compatibility with ProcessMaker.','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly.','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1','en','If any of these items is not supported (marked as No), then please take actions to correct them.','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1','en','If any of these items are not supported (marked as No), then please take actions to correct them.','2015-01-16') ,
( 'LABEL','ID_LDAP_OPTIONAL','en','LDAP is optional.','2014-01-15') ,
( 'LABEL','ID_MSSQL_SUPPORT_OPTIONAL','en','MSSQL Support is optional.','2014-01-15') ,
( 'LABEL','ID_OPENSSL_OPTIONAL','en','OpenSSL is optional.','2014-01-15') ,
@@ -3868,7 +3868,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_PHP_INFO','en','PHP Information','2014-01-15') ,
( 'LABEL','ID_CHECKING','en','Checking...','2014-01-15') ,
( 'LABEL','ID_CHECK_AGAIN','en','Check again','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items is not supported (marked as No) then please take actions to correct them.<br />','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No) then please take actions to correct them.<br />','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly!<br />','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_PHP','en','PHP Version >= 5.2.10','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MYSQL','en','MySQL Support','2014-01-15') ,

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

@@ -52,7 +52,7 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') ==
}
/*----------------------------------********---------------------------------*/
// NEW DASHBOARD MODULE
/*NEW DASHBOARD MODULE*/
$licensedFeatures = & PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=') && ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1)) {
$G_TMP_MENU->AddIdRawOption('DASHBOARD+', 'strategicDashboard/main', G::LoadTranslation('ID_STRATEGIC_DASHBOARD'), '', '', '', 'x-pm-dashboard');
@@ -63,4 +63,3 @@ if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjB
if( file_exists(PATH_CORE . 'menus/plugin.php') ) {
require_once(PATH_CORE . 'menus/plugin.php');
}

3
workflow/engine/templates/processes/main.js
View File

@@ -647,10 +647,11 @@ editProcess = function(typeParam)
if (type == "bpmn") {
url = '../designer?prj_uid=' + pro_uid;
openWindowIfIE(url);
} else {
url = 'processes_Map?PRO_UID=' + pro_uid;
location.href = url;
}
openWindowIfIE(url);
}
editNewProcess = function(){