diff --git a/workflow/engine/classes/class.licensedFeatures.php b/workflow/engine/classes/class.licensedFeatures.php index 9a60e7895..9b543c487 100644 --- a/workflow/engine/classes/class.licensedFeatures.php +++ b/workflow/engine/classes/class.licensedFeatures.php @@ -76,6 +76,9 @@ class PMLicensedFeatures $enable = in_array($value[0], $licenseManager->licensedfeatures); + if (!isset($this->featuresDetails[$value[0]]) || !is_object($this->featuresDetails[$value[0]])) { + $this->featuresDetails[$value[0]] = new stdclass(); + } $this->featuresDetails[$value[0]]->enabled = $enable; return $enable; } diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 098e35de6..aefe8fe35 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ProcessMaker 2.8.0\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2014-10-10 17:13:58\n" +"PO-Revision-Date: 2014-10-13 09:11:02\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -17062,20 +17062,20 @@ msgstr "Assign Users To Group" # TRANSLATION # LABEL/ID_CREATE_AUTH_SOURCE #: LABEL/ID_CREATE_AUTH_SOURCE -msgid "Create Auth Source" -msgstr "Create Auth Source" +msgid "Create Authentication Source" +msgstr "Create Authentication Source" # TRANSLATION # LABEL/ID_UPDATE_AUTH_SOURCE #: LABEL/ID_UPDATE_AUTH_SOURCE -msgid "Update Auth Source" -msgstr "Update Auth Source" +msgid "Update Authentication Source" +msgstr "Update Authentication Source" # TRANSLATION # LABEL/ID_DELETE_AUTH_SOURCE #: LABEL/ID_DELETE_AUTH_SOURCE -msgid "Delete Auth Source" -msgstr "Delete Auth Source" +msgid "Delete Authentication Source" +msgstr "Delete Authentication Source" # TRANSLATION # LABEL/ID_UPDATE_ROLE @@ -17395,6 +17395,36 @@ msgstr "Disable Audit Log" msgid "Remove Plugin" msgstr "Remove Plugin" +# TRANSLATION +# LABEL/ID_CREATE_ROLE +#: LABEL/ID_CREATE_ROLE +msgid "[LABEL/ID_CREATE_ROLE] Create New Role" +msgstr "Create New Role" + +# TRANSLATION +# LABEL/ID_CREATE_GROUP +#: LABEL/ID_CREATE_GROUP +msgid "[LABEL/ID_CREATE_GROUP] Create New Group" +msgstr "Create New Group" + +# TRANSLATION +# LABEL/ID_DELETE_GROUP +#: LABEL/ID_DELETE_GROUP +msgid "Remove Group" +msgstr "Remove Group" + +# TRANSLATION +# LABEL/ID_DISABLE_PLUGIN +#: LABEL/ID_DISABLE_PLUGIN +msgid "Disable Plugin" +msgstr "Disable Plugin" + +# TRANSLATION +# LABEL/ID_ENABLE_PLUGIN +#: LABEL/ID_ENABLE_PLUGIN +msgid "Enable Plugin" +msgstr "Enable Plugin" + # additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml #: text - ADD_TAB_NAME diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index 0ae42f08a..528570da1 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -7142,11 +7142,11 @@ SELECT 'LABEL','ID_ASSIGN_AUTHENTICATION_SOURCE','en','Assign Authentication Sou UNION ALL SELECT 'LABEL','ID_ASSIGN_USER_TO_GROUP','en','Assign Users To Group','2014-10-10' UNION ALL -SELECT 'LABEL','ID_CREATE_AUTH_SOURCE','en','Create Auth Source','2014-10-10' +SELECT 'LABEL','ID_CREATE_AUTH_SOURCE','en','Create Authentication Source','2014-10-13' UNION ALL -SELECT 'LABEL','ID_UPDATE_AUTH_SOURCE','en','Update Auth Source','2014-10-10' +SELECT 'LABEL','ID_UPDATE_AUTH_SOURCE','en','Update Authentication Source','2014-10-13' UNION ALL -SELECT 'LABEL','ID_DELETE_AUTH_SOURCE','en','Delete Auth Source','2014-10-10' +SELECT 'LABEL','ID_DELETE_AUTH_SOURCE','en','Delete Authentication Source','2014-10-13' UNION ALL SELECT 'LABEL','ID_UPDATE_ROLE','en','Update Role','2014-10-10' UNION ALL @@ -7255,6 +7255,16 @@ SELECT 'LABEL','ID_SET_COLUMNS','en','Set Columns','2014-10-10' SELECT 'LABEL','ID_DISABLE_AUDIT_LOG','en','Disable Audit Log','2014-10-10' UNION ALL SELECT 'LABEL','ID_REMOVE_PLUGIN','en','Remove Plugin','2014-10-10' + UNION ALL +SELECT 'LABEL','ID_CREATE_ROLE','en','Create New Role','2014-10-13' + UNION ALL +SELECT 'LABEL','ID_CREATE_GROUP','en','Create New Group','2014-10-13' + UNION ALL +SELECT 'LABEL','ID_DELETE_GROUP','en','Remove Group','2014-10-13' + UNION ALL +SELECT 'LABEL','ID_DISABLE_PLUGIN','en','Disable Plugin','2014-10-13' + UNION ALL +SELECT 'LABEL','ID_ENABLE_PLUGIN','en','Enable Plugin','2014-10-13' ; INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID]) diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 130c47e3f..1be9c2a2a 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -4301,9 +4301,9 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_DISABLE_USER','en','Disable User','2014-10-10') , ( 'LABEL','ID_ASSIGN_AUTHENTICATION_SOURCE','en','Assign Authentication Source','2014-10-10') , ( 'LABEL','ID_ASSIGN_USER_TO_GROUP','en','Assign Users To Group','2014-10-10') , -( 'LABEL','ID_CREATE_AUTH_SOURCE','en','Create Auth Source','2014-10-10') , -( 'LABEL','ID_UPDATE_AUTH_SOURCE','en','Update Auth Source','2014-10-10') , -( 'LABEL','ID_DELETE_AUTH_SOURCE','en','Delete Auth Source','2014-10-10') , +( 'LABEL','ID_CREATE_AUTH_SOURCE','en','Create Authentication Source','2014-10-13') , +( 'LABEL','ID_UPDATE_AUTH_SOURCE','en','Update Authentication Source','2014-10-13') , +( 'LABEL','ID_DELETE_AUTH_SOURCE','en','Delete Authentication Source','2014-10-13') , ( 'LABEL','ID_UPDATE_ROLE','en','Update Role','2014-10-10') , ( 'LABEL','ID_DELETE_ROLE','en','Delete Role','2014-10-10') , ( 'LABEL','ID_ASSIGN_USER_TO_ROLE','en','Assign Users To Role','2014-10-10') , @@ -4358,7 +4358,12 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_INSTALL_PLUGIN','en','Install Plugin','2014-10-10') , ( 'LABEL','ID_SET_COLUMNS','en','Set Columns','2014-10-10') , ( 'LABEL','ID_DISABLE_AUDIT_LOG','en','Disable Audit Log','2014-10-10') , -( 'LABEL','ID_REMOVE_PLUGIN','en','Remove Plugin','2014-10-10') ; +( 'LABEL','ID_REMOVE_PLUGIN','en','Remove Plugin','2014-10-10') , +( 'LABEL','ID_CREATE_ROLE','en','Create New Role','2014-10-13') , +( 'LABEL','ID_CREATE_GROUP','en','Create New Group','2014-10-13') , +( 'LABEL','ID_DELETE_GROUP','en','Remove Group','2014-10-13') , +( 'LABEL','ID_DISABLE_PLUGIN','en','Disable Plugin','2014-10-13') , +( 'LABEL','ID_ENABLE_PLUGIN','en','Enable Plugin','2014-10-13') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') ,