diff --git a/gulliver/system/class.rbac.php b/gulliver/system/class.rbac.php index a16fb0f54..00b430293 100644 --- a/gulliver/system/class.rbac.php +++ b/gulliver/system/class.rbac.php @@ -409,11 +409,7 @@ class RBAC "PER_CODE" => "PM_SETUP_CLEAR_CACHE", "PER_NAME" => "Setup Clear Cache" ], - [ - "PER_UID" => "00000000000000000000000000000025", - "PER_CODE" => "PM_SETUP_HEART_BEAT", - "PER_NAME" => "Setup Heart Beat" - ], + // The 00000000000000000000000000000025 was deleted related to the heart beat [ "PER_UID" => "00000000000000000000000000000026", "PER_CODE" => "PM_SETUP_ENVIRONMENT", diff --git a/rbac/engine/data/mysql/insert.sql b/rbac/engine/data/mysql/insert.sql index 41e5e9a1a..9532b006c 100755 --- a/rbac/engine/data/mysql/insert.sql +++ b/rbac/engine/data/mysql/insert.sql @@ -23,7 +23,6 @@ INSERT INTO `RBAC_PERMISSIONS` VALUES ('00000000000000000000000000000022','PM_SETUP_CALENDAR','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'), ('00000000000000000000000000000023','PM_SETUP_PROCESS_CATEGORIES','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'), ('00000000000000000000000000000024','PM_SETUP_CLEAR_CACHE','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'), -('00000000000000000000000000000025','PM_SETUP_HEART_BEAT','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'), ('00000000000000000000000000000026','PM_SETUP_ENVIRONMENT','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'), ('00000000000000000000000000000027','PM_SETUP_PM_TABLES','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'), ('00000000000000000000000000000028','PM_SETUP_LOGIN','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'), @@ -105,7 +104,6 @@ INSERT INTO `RBAC_ROLES_PERMISSIONS` VALUES ('00000000000000000000000000000002','00000000000000000000000000000022'), ('00000000000000000000000000000002','00000000000000000000000000000023'), ('00000000000000000000000000000002','00000000000000000000000000000024'), -('00000000000000000000000000000002','00000000000000000000000000000025'), ('00000000000000000000000000000002','00000000000000000000000000000026'), ('00000000000000000000000000000002','00000000000000000000000000000027'), ('00000000000000000000000000000002','00000000000000000000000000000028'), @@ -187,7 +185,6 @@ INSERT INTO `RBAC_ROLES_PERMISSIONS` VALUES ('00000000000000000000000000000004','00000000000000000000000000000022'), ('00000000000000000000000000000004','00000000000000000000000000000023'), ('00000000000000000000000000000004','00000000000000000000000000000024'), -('00000000000000000000000000000004','00000000000000000000000000000025'), ('00000000000000000000000000000004','00000000000000000000000000000026'), ('00000000000000000000000000000004','00000000000000000000000000000027'), ('00000000000000000000000000000004','00000000000000000000000000000028'), diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php index d4ac249c0..486388036 100644 --- a/workflow/engine/classes/WorkspaceTools.php +++ b/workflow/engine/classes/WorkspaceTools.php @@ -3325,6 +3325,8 @@ class WorkspaceTools */ public function checkRbacPermissions() { + CLI::logging("-> Remove the permissions depreacated in RBAC \n"); + $this->removePermission(); CLI::logging("-> Verifying roles permissions in RBAC \n"); //Update table RBAC permissions $RBAC = RBAC::getSingleton(); @@ -4079,6 +4081,26 @@ class WorkspaceTools CLI::logging(" Migrating Self-Service by Value Cases Done \n"); } + /** + * Remove the permissions deprecated + */ + public function removePermission() + { + // Initializing + $this->initPropel(true); + $con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME); + // Remove the permission PM_SETUP_HEART_BEAT + CLI::logging("-> Remove permission PM_SETUP_HEART_BEAT \n"); + $con->begin(); + $stmt = $con->createStatement(); + $rs = $stmt->executeQuery("DELETE FROM RBAC_ROLES_PERMISSIONS WHERE PER_UID = '00000000000000000000000000000025'"); + $con->commit(); + $con->begin(); + $stmt = $con->createStatement(); + $rs = $stmt->executeQuery("DELETE FROM RBAC_PERMISSIONS WHERE PER_UID = '00000000000000000000000000000025'"); + $con->commit(); + } + /** * Populate new fields used for avoiding the use of the "APP_CACHE_VIEW" table */ diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 8d825507e..55eec5ea3 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -43785,42 +43785,6 @@ msgstr "" msgid "[setup/plugin_ListOptions.xml?MNU_IMPORT] Import" msgstr "Import" -# setup/processHeartBeatConfig.xml?HB_TITLE -# setup/processHeartBeatConfig.xml -#: title - HB_TITLE -msgid "Processmaker Heartbeat" -msgstr "Processmaker Heartbeat" - -# setup/processHeartBeatConfig.xml?HB_OPTION -# setup/processHeartBeatConfig.xml -#: dropdown - HB_OPTION -msgid "Enable Heartbeat" -msgstr "Enable Heartbeat" - -# setup/processHeartBeatConfig.xml?HB_OPTION-0 -# setup/processHeartBeatConfig.xml -#: dropdown - HB_OPTION - 0 -msgid "[setup/processHeartBeatConfig.xml?HB_OPTION-0]" -msgstr "No" - -# setup/processHeartBeatConfig.xml?HB_OPTION-1 -# setup/processHeartBeatConfig.xml -#: dropdown - HB_OPTION - 1 -msgid "[setup/processHeartBeatConfig.xml?HB_OPTION-1]" -msgstr "Yes" - -# setup/processHeartBeatConfig.xml?HB_SAVE -# setup/processHeartBeatConfig.xml -#: button - HB_SAVE -msgid "[setup/processHeartBeatConfig.xml?HB_SAVE] save" -msgstr "save" - -# setup/processHeartBeatConfig.xml?HB_LINKINFO -# setup/processHeartBeatConfig.xml -#: link - HB_LINKINFO -msgid "[setup/processHeartBeatConfig.xml?HB_LINKINFO] Read Online Documentation" -msgstr "Read Online Documentation" - # setup/showMessage.xml?TITLE # setup/showMessage.xml #: title - TITLE diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index b40a740d7..5a6251fad 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -30,7 +30,6 @@ INSERT INTO CONTENT (CON_CATEGORY,CON_PARENT,CON_ID,CON_LANG,CON_VALUE) VALUES ('PER_NAME','','00000000000000000000000000000022','en','Setup Calendar'), ('PER_NAME','','00000000000000000000000000000023','en','Setup Process Categories'), ('PER_NAME','','00000000000000000000000000000024','en','Setup Clear Cache'), -('PER_NAME','','00000000000000000000000000000025','en','Setup Heart Beat'), ('PER_NAME','','00000000000000000000000000000026','en','Setup Environment'), ('PER_NAME','','00000000000000000000000000000027','en','Setup PM Tables'), ('PER_NAME','','00000000000000000000000000000028','en','Setup Login'), diff --git a/workflow/engine/menus/setup.php b/workflow/engine/menus/setup.php index cc6d1d854..7aca46ec4 100755 --- a/workflow/engine/menus/setup.php +++ b/workflow/engine/menus/setup.php @@ -71,16 +71,6 @@ if ($RBAC->userCanAccess('PM_SETUP') === 1) { * Remove heartbeat config from core, it will probably be used again * when the functionality will be redesigned. */ - if ($RBAC->userCanAccess('PM_SETUP_HEART_BEAT') === 1 && false) { - $G_TMP_MENU->AddIdRawOption( - 'HEARTBEAT', - 'processHeartBeatConfig', - G::LoadTranslation('ID_HEARTBEAT_CONFIG'), - 'heartBeat.jpg', - '', - 'settings' - ); - } } if ($RBAC->userCanAccess('PM_SETUP_ENVIRONMENT') === 1) { $G_TMP_MENU->AddIdRawOption( diff --git a/workflow/engine/methods/setup/processHeartBeatConfig.php b/workflow/engine/methods/setup/processHeartBeatConfig.php deleted file mode 100644 index d69dceeac..000000000 --- a/workflow/engine/methods/setup/processHeartBeatConfig.php +++ /dev/null @@ -1,38 +0,0 @@ -. - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - */ -global $RBAC; -$RBAC->requirePermissions('PM_SETUP', 'PM_SETUP_HEART_BEAT'); - -$oHeadPublisher = headPublisher::getSingleton(); -$oServerConf = ServerConf::getSingleton(); - -//you can use SYS_TEMP or SYS_SYS ON HEAR_BEAT_CONF to save for each workspace -$sflag = $oServerConf->getHeartbeatProperty('HB_OPTION', 'HEART_BEAT_CONF'); -$heartBeatChecked = $sflag == 1 ? true : false; - -$oHeadPublisher->addExtJsScript('setup/processHeartBeatConfig', true); //adding a javascript file .js - - -$oHeadPublisher->assign('heartBeatChecked', $heartBeatChecked); -G::RenderPage('publish', 'extJs'); diff --git a/workflow/engine/xmlform/setup/processHeartBeatConfig.html b/workflow/engine/xmlform/setup/processHeartBeatConfig.html deleted file mode 100644 index 180c19d08..000000000 --- a/workflow/engine/xmlform/setup/processHeartBeatConfig.html +++ /dev/null @@ -1,44 +0,0 @@ -
-
-
- - - - -
- - - - - - - - - - - - - - - - - - - -
-
{$form.HB_TITLE} {$form.HB_LINKINFO}
-
{$HB_OPTION}{$form.HB_OPTION}
{$form.HB_SAVE}
-
-
-
-
- -
- - - - diff --git a/workflow/engine/xmlform/setup/processHeartBeatConfig.xml b/workflow/engine/xmlform/setup/processHeartBeatConfig.xml deleted file mode 100644 index c25b13efd..000000000 --- a/workflow/engine/xmlform/setup/processHeartBeatConfig.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - var sendValues=function(form){ - var hbOption = getField('HB_OPTION').value; - ajax_function('processHeartBeatSave','','HB_OPTION='+hbOption,'POST') ; - window.location = 'processHeartBeatConfig'; - }; - -