diff --git a/README.md b/README.md
index b7d1bad..d5b74f4 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,9 @@
GLPI plugin that provides an interface with a customized ProcessMaker server (https://github.com/tomolimo/processmaker-server).
-version 3.4.5 is compatible with GLPI 9.2 and needs ProcessMaker either 3.0.1.8-RE-1.12 (https://github.com/tomolimo/processmaker-server/releases/tag/3.0.1.8-RE-1.12) or 3.3.0-RE-1.0 (https://github.com/tomolimo/processmaker-server/releases/tag/3.3.0-RE-1.0)
+version 3.4.x is compatible with GLPI 9.2 and needs ProcessMaker either 3.0.1.8-RE-1.12 (https://github.com/tomolimo/processmaker-server/releases/tag/3.0.1.8-RE-1.12) or 3.3.0-RE-1.0 (https://github.com/tomolimo/processmaker-server/releases/tag/3.3.0-RE-1.0)
+
+version 3.5.x is compatible with GLPI 9.3 and needs ProcessMaker 3.3.0-RE-1.x (https://github.com/tomolimo/processmaker-server/releases/latest)
This plugin can run classic and bpmn processes
diff --git a/ajax/dropdownProcesses.php b/ajax/dropdownProcesses.php
index af506a7..ba543e3 100644
--- a/ajax/dropdownProcesses.php
+++ b/ajax/dropdownProcesses.php
@@ -61,15 +61,22 @@ if (empty($_REQUEST['searchText'])) {
}
$processall = (isset($_REQUEST['specific_tags']['process_restrict']) && !$_REQUEST['specific_tags']['process_restrict']);
+$count_cases_per_item = isset($_REQUEST['specific_tags']['count_cases_per_item']) ? $_REQUEST['specific_tags']['count_cases_per_item'] : [];
$result = PluginProcessmakerProcess::getSqlSearchResult(false, $search);
if ($DB->numrows($result)) {
while ($data = $DB->fetch_array($result)) {
$process_entities = PluginProcessmakerProcess::getEntitiesForProfileByProcess($data["id"], $_SESSION['glpiactiveprofile']['id'], true);
- if ($processall || in_array( $_REQUEST["entity_restrict"], $process_entities)) {
- array_push( $processes, [ 'id' => $data["id"],
- 'text' => $data["name"] ]);
+ $can_add = $data['max_cases_per_item'] == 0 || !isset($count_cases_per_item[$data["id"]]) || $count_cases_per_item[$data["id"]] < $data['max_cases_per_item'];
+ if ($processall
+ || ($data['maintenance'] != 1
+ && in_array( $_REQUEST["entity_restrict"], $process_entities)
+ && $can_add) ) {
+
+ array_push( $processes, ['id' => $data["id"],
+ 'text' => $data["name"]
+ ]);
$count++;
}
}
diff --git a/ajax/dropdownUsers.php b/ajax/dropdownUsers.php
index 2ad0286..16785f1 100644
--- a/ajax/dropdownUsers.php
+++ b/ajax/dropdownUsers.php
@@ -57,8 +57,9 @@ if (!isset($_REQUEST['page'])) {
if ($one_item < 0) {
$start = ($_REQUEST['page']-1)*$_REQUEST['page_limit'];
$LIMIT = "LIMIT $start,".$_REQUEST['page_limit'];
+ $searchText = isset($_REQUEST['searchText']) ? $_REQUEST['searchText'] : "";
$result = PluginProcessmakerUser::getSqlSearchResult( $_REQUEST['specific_tags']['taskGuid'], false, $_REQUEST['right'], $_REQUEST["entity_restrict"],
- $_REQUEST['value'], $used, $_REQUEST['searchText'], $LIMIT);
+ $_REQUEST['value'], $used, $searchText, $LIMIT);
} else {
$query = "SELECT DISTINCT `glpi_users`.*
FROM `glpi_users`
diff --git a/front/case.form.php b/front/case.form.php
index 6ed607f..f3f63ac 100644
--- a/front/case.form.php
+++ b/front/case.form.php
@@ -22,16 +22,13 @@ function glpi_processmaker_case_reload_page() {
if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'route' && isset( $_REQUEST['UID'] ) && isset( $_REQUEST['APP_UID'] ) && isset( $_REQUEST['__DynaformName__'] )) {
// then get item id from DB
if ($locCase->getFromGUID($_REQUEST['APP_UID'])) {
-
- if (isset( $_REQUEST['form'] )) {
- $PM_SOAP->derivateCase($locCase, $_REQUEST);
- }
+ $PM_SOAP->derivateCase($locCase, $_REQUEST);
}
glpi_processmaker_case_reload_page();
-} else if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete') {
+} else if (isset($_REQUEST['purge'])) {
// delete case from case table, this will also delete the tasks
- if ($locCase->getFromDB($_POST['cases_id']) && $locCase->deleteCase()) {
+ if ($locCase->getFromDB($_REQUEST['id']) && $locCase->deleteCase()) {
Session::addMessageAfterRedirect(__('Case has been deleted!', 'processmaker'), true, INFO);
} else {
Session::addMessageAfterRedirect(__('Unable to delete case!', 'processmaker'), true, ERROR);
diff --git a/front/case.php b/front/case.php
index 8cb05e5..45bb2ac 100644
--- a/front/case.php
+++ b/front/case.php
@@ -5,19 +5,8 @@ include_once ("../../../inc/includes.php");
Html::header(__('ProcessMaker', 'processmaker'), $_SERVER['PHP_SELF'], "helpdesk", "PluginProcessmakerCase", "cases");
if (!$PM_SOAP->config->fields['maintenance']) {
- if (Session::haveRightsOr("plugin_processmaker_config", [READ, UPDATE])) {
+ if (Session::haveRightsOr("plugin_processmaker_case", [READ, UPDATE])) {
- // force default sort to column id / DESC
- if (empty($_SESSION['glpisearch']['PluginProcessmakerCase'])
- || isset($_GET["reset"])
- || !isset($_GET["sort"])
- ) {
- $_SESSION['glpisearch']['PluginProcessmakerCase']['order'] = 'DESC';
- $_SESSION['glpisearch']['PluginProcessmakerCase']['sort'] = '1';
- if (isset($_GET["reset"])) {
- unset($_GET['reset']);
- }
- }
Search::show('PluginProcessmakerCase');
} else {
Html::displayRightError();
diff --git a/front/process_profile.form.php b/front/process_profile.form.php
index c273793..18d0460 100644
--- a/front/process_profile.form.php
+++ b/front/process_profile.form.php
@@ -4,14 +4,13 @@ include_once ("../../../inc/includes.php");
Session::checkCentralAccess();
-$right = new PluginProcessmakerProcess_Profile();
+$right = new PluginProcessmakerProcess_Profile();
if (isset($_POST["add"])) {
$right->check(-1, UPDATE, $_POST);
- if ($right->add($_POST)) {
- }
+ $right->add($_POST);
Html::back();
-}
+}
Html::displayErrorAndDie("lost");
diff --git a/front/processmaker.form.php b/front/processmaker.form.php
index a2a0b2f..d70ab35 100644
--- a/front/processmaker.form.php
+++ b/front/processmaker.form.php
@@ -3,12 +3,9 @@ include_once ("../../../inc/includes.php");
switch ($_POST["action"]) {
case 'newcase':
- if (isset($_POST['items_id']) && $_POST['items_id'] > 0) { // then this case will be bound to an item
- // TODO: we must check if a case is not already existing
- // to manage the problem of F5 (Refresh)
+ if (isset($_POST['items_id']) && $_POST['items_id'] > 0) {
- //$hasCase = PluginProcessmakerCase::getIDFromItem($_POST['itemtype'], $_POST['items_id']);
- //if ($hasCase === false && $_POST['plugin_processmaker_processes_id'] > 0) {
+ // then this case will be bound to an item
if ($_POST['plugin_processmaker_processes_id'] > 0) {
$resultCase = $PM_SOAP->startNewCase($_POST['plugin_processmaker_processes_id'], $_POST['itemtype'], $_POST['items_id'], Session::getLoginUserID());
@@ -18,9 +15,18 @@ switch ($_POST["action"]) {
if ($case->getFromGUID($resultCase->caseId)) {
$link = $case->getLinkURL();
$task = new PluginProcessmakerTask();
- $task->getFromDBByQuery(" WHERE `plugin_processmaker_cases_id`=".$case->getID()); // normally there is only one and only one first task
+
+ $task->getFromDBByRequest([
+ 'WHERE' => [
+ 'plugin_processmaker_cases_id' => $case->getID()
+ ],
+ ]);
+
+
+ //$task->getFromDBByQuery(" WHERE `plugin_processmaker_cases_id`=".$case->getID()); // normally there is only one and only one first task
//$link .= '&forcetab=PluginProcessmakerTask$'.$task->getID();
- Session::setActiveTab('PluginProcessmakerCase', 'PluginProcessmakerTask$'.$task->getID());
+
+ Session::setActiveTab('PluginProcessmakerCase', 'PluginProcessmakerTask$'.$task->fields['id']);
$item = new $_POST['itemtype'];
$item->getFromDB($_POST['items_id']);
unset($_SERVER['REQUEST_URI']); // to prevent use of processmaker.form.php in NavigateList
@@ -39,11 +45,18 @@ switch ($_POST["action"]) {
Html::back();
}
} else { // the case is created before the ticket (used for post-only case creation before ticket creation)
+ $pm_user_guid = PluginProcessmakerUser::getPMUserId( Session::getLoginUserID() );
$resultCase = $PM_SOAP->newCase( $_POST['plugin_processmaker_processes_id'],
- [ 'GLPI_ITEM_CAN_BE_SOLVED' => 0,
- 'GLPI_SELFSERVICE_CREATED' => '1',
- 'GLPI_ITEM_TYPE' => 'Ticket',
- 'GLPI_URL' => $CFG_GLPI['url_base']] );
+ ['GLPI_ITEM_CAN_BE_SOLVED' => 0,
+ 'GLPI_SELFSERVICE_CREATED' => '1',
+ 'GLPI_ITEM_TYPE' => 'Ticket',
+ 'GLPI_URL' => $CFG_GLPI['url_base'],
+ // Specific to Tickets
+ // GLPI_TICKET_TYPE will contains 1 (= incident) or 2 (= request)
+ 'GLPI_TICKET_TYPE' => $_POST['type'],
+ 'GLPI_ITEM_REQUESTER_GLPI_ID' => Session::getLoginUserID(),
+ 'GLPI_ITEM_REQUESTER_PM_ID' => $pm_user_guid
+ ] );
if ($resultCase->status_code == 0) {
// case is created
// Must show it...
diff --git a/front/processmaker.helpdesk.form.php b/front/processmaker.helpdesk.form.php
index 212a910..5a7175a 100644
--- a/front/processmaker.helpdesk.form.php
+++ b/front/processmaker.helpdesk.form.php
@@ -54,6 +54,7 @@ function processMakerShowCase($ID, $from_helpdesk) {
$rand = rand();
+ $PM_SOAP->echoDomain();
echo "";
$tkt = new Ticket;
diff --git a/hook.php b/hook.php
index 130e12b..85cad3f 100644
--- a/hook.php
+++ b/hook.php
@@ -24,66 +24,6 @@ function plugin_processmaker_MassiveActions($type) {
}
-//function plugin_processmaker_MassiveActionsDisplay($options) {
-
-// switch ($options['itemtype']) {
-// case 'PluginProcessmakerProcess' :
-// //case 'PluginProcessmakerCase' :
-// switch ($options['action']) {
-// case "plugin_processmaker_taskrefresh" :
-// //case "plugin_processmaker_purgecase" :
-// echo " ".self::getStatus($item->fields['case_status'])." "];
+ return [ 'main' => $tabname." ".self::getStatus($item->fields['case_status'])." "];
} else {
$items_id = $item->getID();
$itemtype = $item->getType();
@@ -114,13 +120,13 @@ class PluginProcessmakerCase extends CommonDBTM {
* @param integer $items_id is the item id
* @return integer cases_id
*/
- static function getIDFromItem($itemtype, $items_id) {
- $tmp = New self;
- if ($tmp->getFromDBByQuery(" WHERE items_id=$items_id and itemtype='$itemtype'")) {
- return $tmp->getID();
- }
- return false;
- }
+ //static function getIDFromItem($itemtype, $items_id) {
+ // $tmp = New self;
+ // if ($tmp->getFromDBByQuery(" WHERE items_id=$items_id and itemtype='$itemtype'")) {
+ // return $tmp->getID();
+ // }
+ // return false;
+ //}
/**
@@ -133,7 +139,12 @@ class PluginProcessmakerCase extends CommonDBTM {
static function getIDsFromItem($itemtype, $items_id) {
$ret = [];
$dbu = new DbUtils;
- foreach ($dbu->getAllDataFromTable( self::getTable(), "items_id=$items_id AND itemtype='$itemtype'") as $case) {
+ $restrict = [
+ "items_id" => $items_id,
+ "itemtype" => $itemtype,];
+
+ //foreach ($dbu->getAllDataFromTable( self::getTable(), "items_id=$items_id AND itemtype='$itemtype'") as $case)
+ foreach ($dbu->getAllDataFromTable( self::getTable(), $restrict) as $case) {
$ret[] = $case['id'];
}
return $ret;
@@ -156,7 +167,12 @@ class PluginProcessmakerCase extends CommonDBTM {
* @return boolean
*/
function getFromGUID($case_guid) {
- return $this->getFromDBByQuery(" WHERE case_guid='$case_guid'");
+ $restrict=[
+ 'WHERE' => [
+ 'case_guid' => $case_guid,
+ ],
+ ];
+ return $this->getFromDBByRequest($restrict);
}
@@ -477,9 +493,6 @@ class PluginProcessmakerCase extends CommonDBTM {
*/
static function showCaseInfoTab(CommonGLPI $case, $tabnum = 1, $withtemplate = 0) {
// echo 'The idea is to show here the GLPI ITIL item to which it is linked, and to give a resume of the current case status, and to give possibility to delete or cancel the case.';
-
- echo "";
-
$itemtype = $case->fields['itemtype'];
$maintitle = __('Case is linked to a %1s', 'processmaker');
@@ -487,7 +500,7 @@ class PluginProcessmakerCase extends CommonDBTM {
$maintitle = __('Sub-case is linked to a %1s', 'processmaker');
}
- echo "".sprintf($maintitle, $itemtype::getTypeName(1))." ".sprintf($maintitle, $itemtype::getTypeName(1))."
";
- echo "
";
+ echo "
";
- Html::closeForm();
}
return;
@@ -556,7 +559,7 @@ class PluginProcessmakerCase extends CommonDBTM {
* @param CommonITILObject $item
*/
static function showForItem(CommonITILObject $item) {
- global $DB, $CFG_GLPI;
+ global $DB, $CFG_GLPI, $PM_SOAP;
$items_id = $item->getField('id');
$itemtype = $item->getType();
@@ -570,7 +573,7 @@ class PluginProcessmakerCase extends CommonDBTM {
$rand = mt_rand();
- $query = "SELECT gppc.`id` AS assocID, gppc.`id` as id, gppp.name as pname, gppc.`case_status`, gppc.`plugin_processmaker_cases_id`
+ $query = "SELECT gppc.`id` AS assocID, gppc.`id` as id, gppp.id as pid, gppp.name as pname, gppc.`case_status`, gppc.`plugin_processmaker_cases_id`
FROM `glpi_plugin_processmaker_cases` as gppc
LEFT JOIN `glpi_plugin_processmaker_processes` AS gppp ON gppp.`id`=gppc.`plugin_processmaker_processes_id`
WHERE gppc.`itemtype` = '$itemtype'
@@ -579,25 +582,33 @@ class PluginProcessmakerCase extends CommonDBTM {
$result = $DB->query($query);
$cases = [];
- $used = [];
+ $used = [];
+ $pid = [];
if ($numrows = $DB->numrows($result)) {
while ($data = $DB->fetch_assoc($result)) {
$cases[$data['id']] = $data;
- $used[$data['id']] = $data['id'];
+ $used[$data['id']] = $data['id'];
+ if (isset($pid[$data['pid']])) {
+ $pid[$data['pid']] += 1;
+ } else {
+ $pid[$data['pid']] = 1;
+ }
}
}
$columns = ['pname' => __('Process', 'processmaker'),
- 'name' => __('Title', 'processmaker'),
- 'status' => __('Status', 'processmaker'),
- 'sub' => __('Sub-case of', 'processmaker')
+ 'name' => __('Title', 'processmaker'),
+ 'status' => __('Status', 'processmaker'),
+ 'sub' => __('Sub-case of', 'processmaker')
];
// check if item is not solved nor closed
if ($canupdate
&& $item->fields['status'] != CommonITILObject::SOLVED
&& $item->fields['status'] != CommonITILObject::CLOSED
- && $_SESSION['glpiactiveprofile']['interface'] != 'helpdesk') {
+ && $_SESSION['glpiactiveprofile']['interface'] != 'helpdesk'
+ && ($numrows < $PM_SOAP->config->fields['max_cases_per_item']
+ || $PM_SOAP->config->fields['max_cases_per_item'] == 0)) {
echo "";
echo "
' ;
- //echo "";
- //echo "".__("Self")." ";
- //Dropdown::showYesNo("is_self", $this->fields["is_self"]);
- //echo " ";
-
- //echo "";
- //echo "".__("Source task GUID")." ";
- ////PluginProcessmakerTaskCategory::dropdown(array('name' => 'plugin_processmaker_taskcategories_id_source',
- //// 'display_emptychoice' => false,
- //// 'value' => $this->fields['plugin_processmaker_taskcategories_id_source']));
- //echo " ";
-
- //echo "";
- //echo "".__("Target task GUID")." ";
- ////PluginProcessmakerTaskCategory::dropdown(array('name' => 'plugin_processmaker_taskcategories_id_target',
- //// 'display_emptychoice' => false,
- //// 'value' => $this->fields['plugin_processmaker_taskcategories_id_target']));
- //echo " ";
-
- //echo "";
- //echo "".__("Target process GUID")." ";
- ////Dropdown::show( 'PluginProcessmakerProcess', array('name' => 'plugin_processmaker_processes_id',
- //// 'display_emptychoice' => true,
- //// 'value' => $this->fields['plugin_processmaker_processes_id'],
- //// 'condition' => 'is_active = 1'));
- //echo " ";
-
- //echo "";
- //echo "".__("Target dynaform GUID")." ";
- //echo " ";
-
- //echo "";
- //echo "".__("Source condition")." ";
- ////echo " ";
-
- //echo "";
- //echo "".__("Claim target task")." ";
- //Dropdown::showYesNo("is_targettoclaim", $this->fields["is_targettoclaim"]);
- //echo " ";
-
- //echo "";
- //echo "".__("External application JSON config")." ";
- //echo "";
- //echo " ";
-
- $this->showFormButtons($options );
+ Html::closeForm();
+ $options['candel'] = true;
+ $this->showFormButtons($options);
+ echo Html::scriptBlock("
+ $('#tabsbody th').css('text-align', 'center');
+ $('#tabsbody td').css('text-align', 'center');
+ ");
}
@@ -1271,21 +1287,31 @@ class PluginProcessmakerCase extends CommonDBTM {
*/
function defineTabs($options = []) {
- // $ong = array('empty' => $this->getTypeName(1));
+ $process = new PluginProcessmakerProcess;
+ $process->getFromDB($this->fields['plugin_processmaker_processes_id']);
+
$ong = [];
- //$this->addDefaultFormTab($ong);
+ if (self::isLayoutWithMain()) {
+ $this->addDefaultFormTab($ong);
+ }
- $this->addStandardTab('PluginProcessmakerTask', $ong, $options);
+ if (!$process->fields['maintenance']) {
+ $this->addStandardTab('PluginProcessmakerTask', $ong, $options);
+ }
- $this->addStandardTab(__CLASS__, $ong, $options);
+ if (!self::isLayoutWithMain()) {
+ $this->addStandardTab(__CLASS__, $ong, $options);
+ }
- $this->addStandardTab('PluginProcessmakerCasemap', $ong, $options);
+ if (!$process->fields['maintenance']) {
+ $this->addStandardTab('PluginProcessmakerCasemap', $ong, $options);
- $this->addStandardTab('PluginProcessmakerCasehistory', $ong, $options);
+ $this->addStandardTab('PluginProcessmakerCasehistory', $ong, $options);
- $this->addStandardTab('PluginProcessmakerCasechangelog', $ong, $options);
+ $this->addStandardTab('PluginProcessmakerCasechangelog', $ong, $options);
- $this->addStandardTab('PluginProcessmakerCasedynaform', $ong, $options);
+ $this->addStandardTab('PluginProcessmakerCasedynaform', $ong, $options);
+ }
return $ong;
}
@@ -1311,7 +1337,9 @@ class PluginProcessmakerCase extends CommonDBTM {
$ret = true;
$dbu = new DbUtils;
// then must delete any sub-processes (sub-cases)
- foreach ($dbu->getAllDataFromTable(self::getTable(), "`plugin_processmaker_cases_id` = ".$this->getID()) as $row) {
+ $restrict = ["plugin_processmaker_cases_id" => $this->getID()];
+ //foreach ($dbu->getAllDataFromTable(self::getTable(), "`plugin_processmaker_cases_id` = ".$this->getID()) as $row) {
+ foreach ($dbu->getAllDataFromTable(self::getTable(), $restrict) as $row) {
$tmp = new self;
$tmp->fields = $row;
$ret &= $tmp->delete(['id' => $row['id']]);
@@ -1332,4 +1360,5 @@ class PluginProcessmakerCase extends CommonDBTM {
return $DB->query($query);
}
+
}
diff --git a/inc/casechangelog.class.php b/inc/casechangelog.class.php
index 9d10ce7..34c73e9 100644
--- a/inc/casechangelog.class.php
+++ b/inc/casechangelog.class.php
@@ -10,13 +10,14 @@
*/
class PluginProcessmakerCasechangelog extends CommonDBTM {
- static function displayTabContentForItem(CommonGLPI $case, $tabnum=1, $withtemplate=0) {
+ static function displayTabContentForItem(CommonGLPI $case, $tabnum = 1, $withtemplate = 0) {
global $CFG_GLPI, $PM_SOAP;
$rand = rand();
$caseHistoryURL = $PM_SOAP->serverURL."/cases/ajaxListener?action=changeLogHistory&rand=$rand";
+ $PM_SOAP->echoDomain();
echo ""; //?rand=$rand'
$iframe = "";
- $PM_SOAP->initCaseAndShowTab(['APP_UID' => $case->fields['case_guid'], 'DEL_INDEX' => 1], $iframe, $rand) ;
+ $PM_SOAP->initCaseAndShowTab(['APP_UID' => $case->fields['case_guid'], 'DEL_INDEX' => 1], $iframe, $rand);
}
- function getTabNameForItem(CommonGLPI $case, $withtemplate = 0){
+ function getTabNameForItem(CommonGLPI $case, $withtemplate = 0) {
return __('Change log', 'processmaker');
}
-}
\ No newline at end of file
+}
diff --git a/inc/casedynaform.class.php b/inc/casedynaform.class.php
index e6d85f7..29d5a24 100644
--- a/inc/casedynaform.class.php
+++ b/inc/casedynaform.class.php
@@ -19,6 +19,7 @@ class PluginProcessmakerCasedynaform extends CommonDBTM {
$proj = new PluginProcessmakerProcess;
$proj->getFromDB($case->fields['plugin_processmaker_processes_id']);
+ $PM_SOAP->echoDomain();
echo ""; //?rand=$rand'
echo "";
$iframe = "";
- $PM_SOAP->initCaseAndShowTab(['APP_UID' => $case->fields['case_guid'], 'DEL_INDEX' => 1], $iframe, $rand) ;
+ $PM_SOAP->initCaseAndShowTab(['APP_UID' => $case->fields['case_guid'], 'DEL_INDEX' => 1], $iframe, $rand);
}
- function getTabNameForItem(CommonGLPI $case, $withtemplate = 0){
+ function getTabNameForItem(CommonGLPI $case, $withtemplate = 0) {
return __('History', 'processmaker');
}
-}
\ No newline at end of file
+}
diff --git a/inc/caselink.class.php b/inc/caselink.class.php
index 00b341c..a7e011a 100644
--- a/inc/caselink.class.php
+++ b/inc/caselink.class.php
@@ -148,136 +148,127 @@ class PluginProcessmakerCaselink extends CommonDBTM {
/**
- * Summary of getSearchOptions
+ * Summary of rawSearchOptions
* @return mixed
*/
- function getSearchOptions() {
+ function rawSearchOptions() {
$tab = [];
- $tab['common'] = __('ProcessMaker', 'processmaker');
+ $tab[] = [
+ 'id' => 'common',
+ 'name' => __('ProcessMaker', 'processmaker')
+ ];
- $tab[1]['table'] = $this->getTable();
- $tab[1]['field'] = 'name';
- $tab[1]['name'] = __('Name');
- $tab[1]['datatype'] = 'itemlink';
- $tab[1]['itemlink_type'] = $this->getType();
+ $tab[] = [
+ 'id' => '1',
+ 'table' => $this->getTable(),
+ 'field' => 'name',
+ 'name' => __('Name'),
+ 'datatype' => 'itemlink',
+ 'itemlink_type' => 'PluginProcessmakerCaselink',
+ 'massiveaction' => false
+ ];
- $tab[8]['table'] = $this->getTable();
- $tab[8]['field'] = 'is_active';
- $tab[8]['name'] = __('Active');
- $tab[8]['massiveaction'] = true;
- $tab[8]['datatype'] = 'bool';
+ $tab[] = [
+ 'id' => '8',
+ 'table' => $this->getTable(),
+ 'field' => 'is_active',
+ 'name' => __('Active'),
+ 'massiveaction' => true,
+ 'datatype' => 'bool'
+ ];
- $tab[9]['table'] = $this->getTable();
- $tab[9]['field'] = 'date_mod';
- $tab[9]['name'] = __('Last update');
- $tab[9]['massiveaction'] = false;
- $tab[9]['datatype'] = 'datetime';
+ $tab[] = [
+ 'id' => '9',
+ 'table' => $this->getTable(),
+ 'field' => 'date_mod',
+ 'name' => __('Last update'),
+ 'massiveaction' => false,
+ 'datatype' => 'datetime'
+ ];
- $tab[10]['table'] = $this->getTable();
- $tab[10]['field'] = 'is_externaldata';
- $tab[10]['name'] = __('External data', 'processmaker');
- $tab[10]['massiveaction'] = false;
- $tab[10]['datatype'] = 'bool';
+ $tab[] = [
+ 'id' => '10',
+ 'table' => $this->getTable(),
+ 'field' => 'is_externaldata',
+ 'name' => __('External data', 'processmaker'),
+ 'massiveaction' => false,
+ 'datatype' => 'bool'
+ ];
- $tab[11]['table'] = $this->getTable();
- $tab[11]['field'] = 'is_self';
- $tab[11]['name'] = __('Self', 'processmaker');
- $tab[11]['massiveaction'] = false;
- $tab[11]['datatype'] = 'bool';
+ $tab[] = [
+ 'id' => '11',
+ 'table' => $this->getTable(),
+ 'field' => 'is_self',
+ 'name' => __('Self', 'processmaker'),
+ 'massiveaction' => false,
+ 'datatype' => 'bool'
+ ];
- $tab[12]['table'] = $this->getTable();
- $tab[12]['field'] = 'is_targettoclaim';
- $tab[12]['name'] = __('Claim target task', 'processmaker');
- $tab[12]['massiveaction'] = false;
- $tab[12]['datatype'] = 'bool';
+ $tab[] = [
+ 'id' => '12',
+ 'table' => $this->getTable(),
+ 'field' => 'is_targettoclaim',
+ 'name' => __('Claim target task', 'processmaker'),
+ 'massiveaction' => false,
+ 'datatype' => 'bool'
+ ];
- $tab[13]['table'] = $this->getTable();
- $tab[13]['field'] = 'externalapplication';
- $tab[13]['name'] = __('External application JSON config', 'processmaker');
- $tab[13]['massiveaction'] = false;
- $tab[13]['datatype'] = 'text';
+ $tab[] = [
+ 'id' => '13',
+ 'table' => $this->getTable(),
+ 'field' => 'externalapplication',
+ 'name' => __('External application JSON config', 'processmaker'),
+ 'massiveaction' => false,
+ 'datatype' => 'text'
+ ];
- $tab[14]['table'] = $this->getTable();
- $tab[14]['field'] = 'sourcetask_guid';
- $tab[14]['name'] = __('Source task GUID', 'processmaker');
- $tab[14]['massiveaction'] = false;
- $tab[14]['datatype'] = 'text';
+ $tab[] = [
+ 'id' => '14',
+ 'table' => $this->getTable(),
+ 'field' => 'sourcetask_guid',
+ 'name' => __('Source task GUID', 'processmaker'),
+ 'massiveaction' => false,
+ 'datatype' => 'text'
+ ];
- $tab[15]['table'] = $this->getTable();
- $tab[15]['field'] = 'targettask_guid';
- $tab[15]['name'] = __('Target task GUID', 'processmaker');
- $tab[15]['massiveaction'] = false;
- $tab[15]['datatype'] = 'text';
+ $tab[] = [
+ 'id' => '15',
+ 'table' => $this->getTable(),
+ 'field' => 'targettask_guid',
+ 'name' => __('Target task GUID', 'processmaker'),
+ 'massiveaction' => false,
+ 'datatype' => 'text'
+ ];
- $tab[16]['table'] = $this->getTable();
- $tab[16]['field'] = 'targetdynaform_guid';
- $tab[16]['name'] = __('Target dynaform GUID', 'processmaker');
- $tab[16]['massiveaction'] = false;
- $tab[16]['datatype'] = 'text';
+ $tab[] = [
+ 'id' => '16',
+ 'table' => $this->getTable(),
+ 'field' => 'targetdynaform_guid',
+ 'name' => __('Target dynaform GUID', 'processmaker'),
+ 'massiveaction' => false,
+ 'datatype' => 'text'
+ ];
- $tab[17]['table'] = $this->getTable();
- $tab[17]['field'] = 'targetprocess_guid';
- $tab[17]['name'] = __('Target process GUID', 'processmaker');
- $tab[17]['massiveaction'] = false;
- $tab[17]['datatype'] = 'text';
+ $tab[] = [
+ 'id' => '17',
+ 'table' => $this->getTable(),
+ 'field' => 'targetprocess_guid',
+ 'name' => __('Target process GUID', 'processmaker'),
+ 'massiveaction' => false,
+ 'datatype' => 'text'
+ ];
- $tab[18]['table'] = $this->getTable();
- $tab[18]['field'] = 'sourcecondition';
- $tab[18]['name'] = __('Source condition', 'processmaker');
- $tab[18]['massiveaction'] = false;
- $tab[18]['datatype'] = 'text';
-
- //$tab[14]['table'] = 'glpi_taskcategories';
- //$tab[14]['field'] = 'completename'; //'plugin_processmaker_taskcategories_id_source';
- //$tab[14]['name'] = __('Source task');
- //$tab[14]['massiveaction'] = false;
- //$tab[14]['datatype'] = 'dropdown';
- //$tab[14]['forcegroupby'] = true;
- //$tab[14]['joinparams'] =
- // [
- // 'beforejoin' => [
- // 'table' => 'glpi_plugin_processmaker_taskcategories',
- // 'joinparams' => [
- // 'beforejoin' => [
- // 'table' => 'glpi_plugin_processmaker_caselinks'
- // ]
- // ]
- // ]
- // ];
+ $tab[] = [
+ 'id' => '18',
+ 'table' => $this->getTable(),
+ 'field' => 'sourcecondition',
+ 'name' => __('Source condition', 'processmaker'),
+ 'massiveaction' => false,
+ 'datatype' => 'text'
+ ];
return $tab;
}
- //static function getMenuContent() {
-
- // if (!Session::haveRight('entity', READ)) {
- // return;
- // }
-
- // $front_page = "/plugins/processmaker/front";
- // $menu = array();
- // //$menu['title'] = self::getMenuName();
- // //$menu['page'] = "$front_page/caselink.php";
-
- // $itemtypes = array('PluginProcessmakerCaselink' => 'processmakercaselinks');
-
- // foreach ($itemtypes as $itemtype => $option) {
- // $menu['options'][$option]['title'] = $itemtype::getTypeName(Session::getPluralNumber());
- // switch( $itemtype ) {
- // case 'PluginProcessmakerCaselink':
- // $menu['options'][$option]['page'] = $itemtype::getSearchURL(false);
- // $menu['options'][$option]['links']['search'] = $itemtype::getSearchURL(false);
- // if ($itemtype::canCreate()) {
- // $menu['options'][$option]['links']['add'] = $itemtype::getFormURL(false);
- // }
- // break ;
- // default :
- // $menu['options'][$option]['page'] = PluginProcessmakerCaselink::getSearchURL(false);
- // break ;
- // }
-
- // }
- // return $menu;
- //}
}
diff --git a/inc/caselinkaction.class.php b/inc/caselinkaction.class.php
index bce380d..60f0eb8 100644
--- a/inc/caselinkaction.class.php
+++ b/inc/caselinkaction.class.php
@@ -9,4 +9,4 @@
* @author MoronO
*/
class PluginProcessmakerCaselinkaction extends CommonDBTM {
-}
\ No newline at end of file
+}
diff --git a/inc/casemap.class.php b/inc/casemap.class.php
index 2b2c53a..4c268c0 100644
--- a/inc/casemap.class.php
+++ b/inc/casemap.class.php
@@ -10,7 +10,7 @@
*/
class PluginProcessmakerCasemap extends CommonDBTM {
- static function displayTabContentForItem(CommonGLPI $case, $tabnum=1, $withtemplate=0) {
+ static function displayTabContentForItem(CommonGLPI $case, $tabnum = 1, $withtemplate = 0) {
global $CFG_GLPI, $PM_SOAP;
$rand = rand();
@@ -26,6 +26,7 @@ class PluginProcessmakerCasemap extends CommonDBTM {
"/cases/ajaxListener?action=processMap"
)."&rand=$rand";
+ $PM_SOAP->echoDomain();
echo ""; //?rand=$rand'
$iframe = "";
- $PM_SOAP->initCaseAndShowTab(['APP_UID' => $case->fields['case_guid'], 'DEL_INDEX' => 1], $iframe, $rand) ;
+ $PM_SOAP->initCaseAndShowTab(['APP_UID' => $case->fields['case_guid'], 'DEL_INDEX' => 1], $iframe, $rand);
}
- function getTabNameForItem(CommonGLPI $case, $withtemplate = 0){
+ function getTabNameForItem(CommonGLPI $case, $withtemplate = 0) {
return __('Map', 'processmaker');
}
-}
\ No newline at end of file
+}
diff --git a/inc/config.class.php b/inc/config.class.php
index 9520523..3ad759e 100644
--- a/inc/config.class.php
+++ b/inc/config.class.php
@@ -158,8 +158,9 @@ class PluginProcessmakerConfig extends CommonDBTM {
echo "";
echo "".__('Server URL (must be in same domain than GLPI)', 'processmaker')." ";
echo " ";
+ echo " \n";
+ echo "";
echo "".__('Common domain with GLPI', 'processmaker')." ";
echo "".$config->fields['domain']."
".__('Not connected');
}
-
echo " \n";
+
+ echo "";
+ echo "" . __('Max cases per item (0=unlimited)', 'processmaker') . " ";
+ echo " \n";
+
} else {
echo "";
PluginProcessmakerProcessmaker::showUnderMaintenance();
echo " ".__('Maintenance')." ".__('Maintenance')." ";
- echo "".__('Maintenance mode')." ";
- Dropdown::showYesNo("maintenance", $config->fields['maintenance']);
- echo " ";
+ echo "";
+ echo "".__('Maintenance mode')." ";
+ Dropdown::showYesNo("maintenance", $config->fields['maintenance']);
+ echo " ";
- echo "".__('Processmaker system information', 'processmaker')." ".__('Processmaker system information', 'processmaker')." '.__('Version', 'processmaker').' '.$info->version.' '.__('Version', 'processmaker').' '.__('Not yet!', 'processmaker').' ";
- echo "".__("Active")." ";
+ echo " ".__('Active')." ";
Dropdown::showYesNo("is_active", $this->fields["is_active"]);
echo " ";
@@ -608,6 +683,11 @@ class PluginProcessmakerProcess extends CommonDBTM {
Dropdown::showYesNo("insert_task_comment", $this->fields["insert_task_comment"]);
echo "";
+ echo "";
+ echo "" . __('Max cases per item (0=unlimited)', 'processmaker') . " ";
+ echo " \n";
+
echo "";
echo "".__('Visible in Incident for Central interface', 'processmaker')." ";
Dropdown::showYesNo("is_incident", $this->fields["is_incident"]);
@@ -680,6 +760,15 @@ class PluginProcessmakerProcess extends CommonDBTM {
Dropdown::showFromArray( 'project_type', self::getAllTypeArray(), [ 'value' => $this->fields["project_type"] ] );
echo " ";
+ echo "";
+ echo "".__('Maintenance mode')." ";
+ Dropdown::showYesNo("maintenance", $this->fields["maintenance"]);
+ if ($this->fields["maintenance"]) {
+ echo " ";
+ echo " ";
+
$this->showFormButtons($options);
}
@@ -801,5 +890,24 @@ class PluginProcessmakerProcess extends CommonDBTM {
}
+
+ /**
+ * Summary of underMaintenance
+ * Shows a nice(?) under maintenance message
+ */
+ static function showUnderMaintenance($ptitle, $size = '') {
+ global $CFG_GLPI;
+ if ($size != '') {
+ $size .= '-';
+ }
+ echo "";
+
+ echo Html::image($CFG_GLPI['root_doc']."/plugins/processmaker/pics/{$size}under_maintenance.png");
+ echo "
";
+ echo sprintf(__('Process \'%s\' is under maintenance, please retry later, thank you.', 'processmaker'), $ptitle);
+ echo "
";
+ echo "
";
echo Html::image($CFG_GLPI['root_doc'].'/plugins/processmaker/pics/under_maintenance.png');
echo "
";
- __('ProcessMaker plugin is under maintenance, please retry later, thank you.', 'processmaker');
+ echo __('ProcessMaker plugin is under maintenance, please retry later, thank you.', 'processmaker');
echo "
";
echo "
https://raw.githubusercontent.com/tomolimo/processmaker/master/processmaker.png
- Ce plugin fournit la possibilité d'intégrer un processus (workflow) aux objets ITIL (Tickets, Changements et Problèmes).
+ Ce plugin fournit la possibilité d'intégrer un processus (workflow) aux objets ITIL (Tickets, Changements et Problèmes).
This plugin provides a process (workflow) management linked to ITIL objects (Tickets, Changes and Problems).
- Tento zásuvný modul poskytuje správu procesů (pracovní postup) napojený na požadavky.
-
+ Tento zásuvný modul poskytuje správu procesů (pracovní postup) napojený na požadavky.
+
This plugin is dedicated to provide process (workflows) management linked to ITIL objects (Tickets, Changes and Problems). This goal is achieved using a customized ProcessMaker server (URL: https://github.com/tomolimo/processmaker-server). ProcessMaker provides BPMN Process design and execution. This plugin is the glue between GLPI and ProcessMaker.
- Ce plugin est dédié à la gestion de processus (workflows) liés aux objets ITIL (Tickets, Changements et Problèmes). Ce but est atteint par l'utilisation d'un serveur ProcessMaker customisé (URL: https://github.com/tomolimo/processmaker-server). ProcessMaker fournit un outil graphique de création de processus BPMN et permet l'exécution de ceux-ci. Ce plugin sert de glue entre GLPI et ProcessMaker.
- Tento zásuvný modul je věnován poskytnutí správy procesu (pracovní postup), napojeného na požadavky. Tohoto cíle je dosaženo použitím ProcessMaker (URL: https://github.com/tomolimo/processmaker-server). ProcessMaker poskytne návrh procesu a vykonání pracovního postupu. Tento zásuvný modul je můstkem mezi GLPI a ProcessMaker.
-
+ Ce plugin est dédié à la gestion de processus (workflows) liés aux objets ITIL (Tickets, Changements et Problèmes). Ce but est atteint par l'utilisation d'un serveur ProcessMaker customisé (URL: https://github.com/tomolimo/processmaker-server). ProcessMaker fournit un outil graphique de création de processus BPMN et permet l'exécution de ceux-ci. Ce plugin sert de glue entre GLPI et ProcessMaker.
+ Tento zásuvný modul je věnován poskytnutí správy procesu (pracovní postup), napojeného na požadavky. Tohoto cíle je dosaženo použitím ProcessMaker (URL: https://github.com/tomolimo/processmaker-server). ProcessMaker poskytne návrh procesu a vykonání pracovního postupu. Tento zásuvný modul je můstkem mezi GLPI a ProcessMaker.
+
https://github.com/tomolimo/processmaker
https://github.com/tomolimo/processmaker/releases
@@ -28,10 +28,14 @@
3.3.8
9.1
-
- 3.4.5
- 9.2
-
+
+ 3.4.9
+ 9.2
+
+
+ 3.5.1
+ 9.3
+
en_gb
@@ -44,22 +48,15 @@
Processus
BPMN 2.0
Workflow
- Helpdesk
- Ticket
+ Helpdesk
+ Ticket
Processes
BPMN 2.0
Helpdesk
- Workflows
- Ticket
+ Workflows
+ Ticket
-
- Procesy
- BPMN 2.0
- Službapodpory
- Pracovnípostupy
- Požadavek
-
-
+
\ No newline at end of file
diff --git a/setup.php b/setup.php
index f894ae2..16f2a77 100644
--- a/setup.php
+++ b/setup.php
@@ -2,7 +2,7 @@
// used for case cancellation
define("CANCEL", 256);
-define('PROCESSMAKER_VERSION', '3.4.5');
+define('PROCESSMAKER_VERSION', '3.5.1');
// Init the hooks of the plugins -Needed
function plugin_init_processmaker() {
@@ -11,7 +11,6 @@ function plugin_init_processmaker() {
$PLUGIN_HOOKS['csrf_compliant']['processmaker'] = true;
$objects = ['Ticket', 'Change', 'Problem'];
- // $objects = ['Ticket'];
Plugin::registerClass('PluginProcessmakerProcessmaker');
@@ -33,11 +32,6 @@ function plugin_init_processmaker() {
$PLUGIN_HOOKS['pre_show_item']['processmaker']
= ['PluginProcessmakerProcessmaker', 'pre_show_item_processmaker'];
- //$PLUGIN_HOOKS['pre_item_form']['processmaker']
- // = array('PluginProcessmakerProcessmaker', 'pre_item_form_processmakerticket');
- //$PLUGIN_HOOKS['post_item_form']['processmaker']
- // = array('PluginProcessmakerProcessmaker', 'post_item_form_processmakerticket');
-
$PLUGIN_HOOKS['pre_show_tab']['processmaker']
= ['PluginProcessmakerProcessmaker', 'pre_show_tab_processmaker'];
$PLUGIN_HOOKS['post_show_tab']['processmaker']
@@ -45,8 +39,13 @@ function plugin_init_processmaker() {
// Display a menu entry ?
if (Session::haveRightsOr('plugin_processmaker_config', [READ, UPDATE])) {
- // tools and helpdesk
- $PLUGIN_HOOKS['menu_toadd']['processmaker'] = ['tools' => 'PluginProcessmakerMenu', 'helpdesk' => 'PluginProcessmakerCase'];
+ // tools
+ $PLUGIN_HOOKS['menu_toadd']['processmaker']['tools'] = 'PluginProcessmakerMenu';
+ }
+
+ if (Session::haveRightsOr('plugin_processmaker_case', [READ, UPDATE])) {
+ // helpdesk
+ $PLUGIN_HOOKS['menu_toadd']['processmaker']['helpdesk'] = 'PluginProcessmakerCase';
}
Plugin::registerClass('PluginProcessmakerProcess', [ 'massiveaction_nodelete_types' => true] );
@@ -83,43 +82,27 @@ function plugin_init_processmaker() {
$hooks = [];
foreach ($objects as $obj) {
- $hooks["PluginPdf'.$obj.'Task"] = ['PluginProcessmakerProcessmaker', 'plugin_item_get_pdfdata_processmaker'];
+ $hooks["PluginPdf".$obj."Task"] = ['PluginProcessmakerProcessmaker', 'plugin_item_get_pdfdata_processmaker'];
}
$PLUGIN_HOOKS['item_get_pdfdatas']['processmaker'] = $hooks;
- //$hooks = [];
- //foreach($objects as $obj){
- // $hooks[$obj.'_User'] = 'plugin_pre_item_purge_processmaker';
- //}
- //$PLUGIN_HOOKS['pre_item_purge']['processmaker'] = $hooks;
-
- //$hooks = [];
- //foreach($objects as $obj){
- // $hooks[$obj.'_User'] = 'plugin_item_purge_processmaker';
- //}
- //$PLUGIN_HOOKS['item_purge']['processmaker'] = $hooks;
-
$plugin = new Plugin();
if ($plugin->isActivated('processmaker')
&& Session::getLoginUserID() ) {
-
+
$url = explode("/", $_SERVER['PHP_SELF']);
$pageName = explode("?", array_pop($url));
switch ($pageName[0]) {
case "tracking.injector.php":
case "helpdesk.public.php":
- $PLUGIN_HOOKS['add_javascript']['processmaker'][] = "js/helpdesk.public.js.php";
+ $PLUGIN_HOOKS['add_javascript']['processmaker'] = ["js/helpdesk.public.js.php"];
break;
case "planning.php":
- $PLUGIN_HOOKS['add_javascript']['processmaker'][] = "js/planning.js";
+ $PLUGIN_HOOKS['add_javascript']['processmaker'] = ["js/planning.js"];
break;
case "central.php":
- $PLUGIN_HOOKS['add_javascript']['processmaker'][] = "js/central.js";
- break;
- case "case.form.php":
- case "processmaker.helpdesk.form.php" :
- $PLUGIN_HOOKS['add_javascript']['processmaker'] = ["js/domain.js.php"];
- break;
+ $PLUGIN_HOOKS['add_javascript']['processmaker'] = ["js/central.js"];
+ break;
}
}
@@ -145,17 +128,17 @@ function plugin_version_processmaker() {
'homepage' => 'https://github.com/tomolimo/processmaker',
'requirements' => [
'glpi' => [
- 'min' => '9.2',
- 'max' => '9.2.99'
+ 'min' => '9.3',
+ 'max' => '9.4'
],
- ]
+ ]
];
}
// Optional : check prerequisites before install : may print errors or add to message after redirect
function plugin_processmaker_check_prerequisites() {
- if (version_compare(GLPI_VERSION, '9.2', 'lt') || version_compare(GLPI_VERSION, '9.3', 'ge')) {
- echo "This plugin requires GLPI >= 9.2 and < 9.3";
+ if (version_compare(GLPI_VERSION, '9.3', 'lt') || version_compare(GLPI_VERSION, '9.4', 'ge')) {
+ echo "This plugin requires GLPI >= 9.3 and < 9.4";
return false;
}
";
+ }
+ echo "