Merge branch 'support/2.13.0' into develop

pluginsGLPI · Sep 5, 2022 · aee2be0 · aee2be0
2 parents dc95c73 + 52e3536
commit aee2be0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 30 deletions.
diff --git a/hook.php b/hook.php
@@ -447,7 +447,7 @@ function plugin_formcreator_hook_update_ticket(CommonDBTM $item) {
  // No issue linked to the ticket,
  // then find the form answer linked to the ticket
  $formAnswer = new PluginFormcreatorFormAnswer();
- if ($formAnswer->getFromDbByTicket($id)) {
+ if (!$formAnswer->getFromDbByTicket($id)) {
  // Should not happen as one and only one form answer shall be linked to a ticket
  // If several formanswer found, the previous getFromDBByCrit() logs an error
  return;

diff --git a/inc/abstractitiltarget.class.php b/inc/abstractitiltarget.class.php
@@ -1605,6 +1605,19 @@ public function prepareInputForUpdate($input) {
  Session::addMessageAfterRedirect(__('The description cannot be empty!', 'formcreator'), false, ERROR);
  return [];
  }
+
+ if (Plugin::isPluginActive('tag')) {
+ if (isset($input['_tag_questions'])) {
+ $input['tag_questions'] = (!empty($input['_tag_questions']))
+ ? implode(',', $input['_tag_questions'])
+ : '';
+ }
+ if (isset($input['_tag_specifics'])) {
+ $input['tag_specifics'] = (!empty($input['_tag_specifics']))
+ ? implode(',', $input['_tag_specifics'])
+ : '';
+ }
+ }
  }
 
  if (isset($input['_skip_create_actors']) && $input['_skip_create_actors']) {

diff --git a/inc/form.class.php b/inc/form.class.php
@@ -836,6 +836,8 @@ protected function showSearchBar() : void {
 
  protected function showMyLastForms() : void {
  $limit = 5;
+ $formanswerUrl = PluginFormcreatorFormAnswer::getSearchURL();
+ $rawKeyBase = 'ITEM_' . PluginFormcreatorFormAnswer::class;
  echo '<div id="plugin_formcreator_last_req_forms" class="card">';
  echo '<div class="card-title">'.sprintf(__('My %1$d last forms (requester)', 'formcreator'), $limit).'</div>';
  $criteria = [
@@ -869,7 +871,6 @@ protected function showMyLastForms() : void {
  echo '<div class="card-body">';
  echo '<ul class="list-group">';
  foreach ($search['data']['rows'] as $formAnswer) {
- $rawKeyBase = 'ITEM_' . PluginFormcreatorFormAnswer::class;
  switch ($formAnswer['raw']["${rawKeyBase}_8"]) {
  case PluginFormcreatorFormAnswer::STATUS_WAITING:
  $status = CommonITILObject::WAITING;
@@ -892,7 +893,6 @@ protected function showMyLastForms() : void {
  echo '</ul>';
  echo '<div class="text-center card-footer">';
  $criteria = Toolbox::append_params($criteria, '&amp;');
- $formanswerUrl = PluginFormcreatorFormAnswer::getSearchURL();
  echo '<a href="' . $formanswerUrl . '?' . $criteria . '">';
  echo __('All my forms (requester)', 'formcreator');
  echo '</a>';

diff --git a/inc/targetchange.class.php b/inc/targetchange.class.php
@@ -579,19 +579,6 @@ public function prepareInputForUpdate($input) {
  break;
  }
  }
-
- if (Plugin::isPluginActive('tag')) {
- if (isset($input['_tag_questions'])) {
- $input['tag_questions'] = (!empty($input['_tag_questions']))
- ? implode(',', $input['_tag_questions'])
- : '';
- }
- if (isset($input['_tag_specifics'])) {
- $input['tag_specifics'] = (!empty($input['_tag_specifics']))
- ? implode(',', $input['_tag_specifics'])
- : '';
- }
- }
  }
 
  return parent::prepareInputForUpdate($input);

diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
@@ -682,20 +682,6 @@ public function prepareInputForUpdate($input) {
  $input['contract_question'] = '0';
  }
  }
-
- $plugin = new Plugin();
- if (Plugin::isPluginActive('tag')) {
- if (isset($input['_tag_questions'])) {
- $input['tag_questions'] = (!empty($input['_tag_questions']))
- ? implode(',', $input['_tag_questions'])
- : '';
- }
- if (isset($input['_tag_specifics'])) {
- $input['tag_specifics'] = (!empty($input['_tag_specifics']))
- ? implode(',', $input['_tag_specifics'])
- : '';
- }
- }
  }
 
  if (isset($input['_linktype']) && isset($input['_link_itemtype'])) {