feat(section): update condition count after section edition

btry · btry · commit 8c04048f5489 · 2023-05-23T14:32:11.000+02:00
diff --git a/ajax/section_update.php b/ajax/section_update.php
@@ -50,4 +50,4 @@
     Session::addMessageAfterRedirect(__('Could not update the section', 'formcreator'), false, ERROR);
     exit;
 }
-echo json_encode(['id' => $section->getID(), 'name' => $section->fields['name']], JSON_UNESCAPED_UNICODE);
+echo json_encode(['id' => $section->getID(), 'name' => $section->getDesignLabel()], JSON_UNESCAPED_UNICODE);
diff --git a/inc/section.class.php b/inc/section.class.php
@@ -541,4 +541,22 @@ public function getTranslatableStrings(array $options = []) : array {
 
       return $strings;
    }
+
+   public function getDesignLabel(): string {
+      $sectionId = $this->getID();
+      $nb = (new DBUtils())->countElementsInTable(PluginFormcreatorCondition::getTable(), [
+         'itemtype' => self::getType(),
+         'items_id' => $sectionId,
+      ]);
+      $formId = $this->fields[PluginFormcreatorForm::getForeignKeyField()];
+      $onclick = 'plugin_formcreator.showSectionForm(' . $formId . ', ' . $sectionId . ');';
+      $html = '<a href="#" onclick=' . $onclick . '" data-field="name">';
+      $html .= "<sup class='plugin_formcreator_conditions_count' title='" . __('Count of conditions', 'formcreator') ."'>$nb</sup>";
+      $html .= '<span>';
+      $html .= empty($this->fields['name']) ? '(' . $sectionId . ')' : $this->fields['name'];
+      $html .= '</span>';
+      $html .= '</a>';
+
+      return $html;
+   }
 }
diff --git a/js/scripts.js b/js/scripts.js
@@ -1043,7 +1043,7 @@ var plugin_formcreator = new function() {
          displayAjaxMessageAfterRedirect();
       }).done(function (data) {
          var section = $('.plugin_formcreator_form_design[data-itemtype="PluginFormcreatorForm"] [data-itemtype="PluginFormcreatorSection"][data-id="' + sectionId + '"]');
-         section.find('> a [data-field="name"]').text(data['name']);
+         section.find('[data-field="name"]').replaceWith(data['name']);
          that.resetTabs();
       }).complete(function () {
          var myModal = form.closest('div.modal');
diff --git a/templates/components/form/section_design.html.twig b/templates/components/form/section_design.html.twig
@@ -32,15 +32,15 @@
 
 <li class="plugin_formcreator_section" data-itemtype="PluginFormcreatorSection" data-id="{{ item.fields['id'] }}">
     {% set conditionsCount = call('PluginFormcreatorCondition::countForItem', [item]) %}
-    <a href="#" onclick="plugin_formcreator.showSectionForm({{ item.fields['plugin_formcreator_forms_id'] }}, {{ item.fields['id'] }})">
+    <a href="#" onclick="plugin_formcreator.showSectionForm({{ item.fields['plugin_formcreator_forms_id'] }}, {{ item.fields['id'] }})" data-field="name">
         {# TODO : Show count of conditions #}
         <sup class="plugin_formcreator_conditions_count" title="{{ __('Count of conditions', 'formcreator') }}">{{ conditionsCount }}</sup>
         {% if item.fields['name'] is empty %}
             {% set name = '(' ~ item.fields['id'] ~ ')' %}
         {% else %}
             {% set name = call('Glpi\\Toolbox\\Sanitizer::unsanitize', [item.fields['name']]) %}
         {% endif %}
-        <span data-field="name">{{ name }}</span>
+        <span>{{ name }}</span>
     </a>
 
     {# Delete a section #}

Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,4 @@`
`50`	`50`	`Session::addMessageAfterRedirect(__('Could not update the section', 'formcreator'), false, ERROR);`
`51`	`51`	`exit;`
`52`	`52`	`}`
`53`		`-echo json_encode(['id' => $section->getID(), 'name' => $section->fields['name']], JSON_UNESCAPED_UNICODE);`
	`53`	`+echo json_encode(['id' => $section->getID(), 'name' => $section->getDesignLabel()], JSON_UNESCAPED_UNICODE);`