Merge branch 'release/1.12.5'

pluginsGLPI · Apr 28, 2021 · d36cc9a · d36cc9a
2 parents 5cc4aed + 9ea2932
commit d36cc9a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 32 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/inc/field.class.php b/inc/field.class.php
@@ -699,7 +699,7 @@ static function prepareHtmlFields($fields, $items_id, $itemtype, $canedit = true
             }
 
             //get default value
-            if ($value === "" && $field['default_value'] !== "") {
+            if ($value === "" && $field['default_value'] !== "" && $itemtype::isNewID($items_id)) {
                $value = $field['default_value'];
 
                // shortcut for date/datetime

diff --git a/plugin.xml b/plugin.xml
@@ -97,6 +97,11 @@ Il existe un [script de migration](https://github.com/pluginsGLPI/customfields/b
       <author>Johan Cwiklinski</author>
    </authors>
    <versions>
+      <version>
+         <num>1.12.5</num>
+         <compatibility>~9.5.0</compatibility>
+         <download_url>https://github.com/pluginsGLPI/fields/releases/download/1.12.5/glpi-fields-1.12.5.tar.bz2</download_url>
+      </version>
       <version>
          <num>1.12.4</num>
          <compatibility>~9.5.0</compatibility>

diff --git a/setup.php b/setup.php
@@ -26,7 +26,7 @@
  --------------------------------------------------------------------------
  */
 
-define ('PLUGIN_FIELDS_VERSION', '1.12.4');
+define ('PLUGIN_FIELDS_VERSION', '1.12.5');
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_FIELDS_MIN_GLPI", "9.5");