PHRAS-3947: Prod - Editing - restrict field content to thesaurus and …

…or suggested values (#4426) * add property input-disabled in field * fix * fix
alchemy-fr · Dec 4, 2023 · f0baae9 · f0baae9
1 parent 945be4c
commit f0baae9
Show file tree

Hide file tree

Showing 27 changed files with 232 additions and 110 deletions.
diff --git a/Phraseanet-production-client/config/config.js b/Phraseanet-production-client/config/config.js
@@ -13,5 +13,5 @@ module.exports = {
     setupDir: _root + 'tests/setup/node.js',
     karmaConf: _root + 'config/karma.conf.js',
     // change this version when you change JS file for lazy loading
-    assetFileVersion: 98
+    assetFileVersion: 99
 };
diff --git a/Phraseanet-production-client/dist/authenticate.js b/Phraseanet-production-client/dist/authenticate.js
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=98";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=99";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

diff --git a/Phraseanet-production-client/dist/authenticate.min.js b/Phraseanet-production-client/dist/authenticate.min.js
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=98";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=99";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

diff --git a/Phraseanet-production-client/dist/commons.js b/Phraseanet-production-client/dist/commons.js
@@ -91,7 +91,7 @@
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=98";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=99";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

diff --git a/Phraseanet-production-client/dist/commons.min.js b/Phraseanet-production-client/dist/commons.min.js
@@ -91,7 +91,7 @@
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=98";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=99";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

diff --git a/Phraseanet-production-client/dist/production.js b/Phraseanet-production-client/dist/production.js
@@ -22818,12 +22818,24 @@ var recordEditorService = function recordEditorService(services) {
                             $editTimeArea.hide();
                             $editDateArea.css('width', 210);
                         }
+
+                        if (field.input_disable) {
+                            $editDateArea.prop('disabled', true);
+                        } else {
+                            $editDateArea.prop('disabled', false);
+                        }
                     } else {
                         $editDateArea.hide();
                         $editTimeArea.hide();
                         (0, _jquery2.default)('#idEditDateZone', options.$container).hide();
                         $editTextArea.show();
                         $editTextArea.css('height', '100%');
+
+                        if (field.input_disable) {
+                            $editTextArea.prop('disabled', true);
+                        } else {
+                            $editTextArea.prop('disabled', false);
+                        }
                     }
 
                     $ztextStatus.hide();
@@ -22884,6 +22896,12 @@ var recordEditorService = function recordEditorService(services) {
 
                     $editMultiValTextArea.trigger('keyup.maxLength');
 
+                    if (field.input_disable) {
+                        $editMultiValTextArea.prop('disabled', true);
+                    } else {
+                        $editMultiValTextArea.prop('disabled', false);
+                    }
+
                     self.setTimeout(function () {
                         return $editMultiValTextArea.focus();
                     }, 50);

diff --git a/Phraseanet-production-client/dist/production.min.js b/Phraseanet-production-client/dist/production.min.js
@@ -22818,12 +22818,24 @@ var recordEditorService = function recordEditorService(services) {
                             $editTimeArea.hide();
                             $editDateArea.css('width', 210);
                         }
+
+                        if (field.input_disable) {
+                            $editDateArea.prop('disabled', true);
+                        } else {
+                            $editDateArea.prop('disabled', false);
+                        }
                     } else {
                         $editDateArea.hide();
                         $editTimeArea.hide();
                         (0, _jquery2.default)('#idEditDateZone', options.$container).hide();
                         $editTextArea.show();
                         $editTextArea.css('height', '100%');
+
+                        if (field.input_disable) {
+                            $editTextArea.prop('disabled', true);
+                        } else {
+                            $editTextArea.prop('disabled', false);
+                        }
                     }
 
                     $ztextStatus.hide();
@@ -22884,6 +22896,12 @@ var recordEditorService = function recordEditorService(services) {
 
                     $editMultiValTextArea.trigger('keyup.maxLength');
 
+                    if (field.input_disable) {
+                        $editMultiValTextArea.prop('disabled', true);
+                    } else {
+                        $editMultiValTextArea.prop('disabled', false);
+                    }
+
                     self.setTimeout(function () {
                         return $editMultiValTextArea.focus();
                     }, 50);

diff --git a/Phraseanet-production-client/src/components/record/recordEditor/index.js b/Phraseanet-production-client/src/components/record/recordEditor/index.js
@@ -623,12 +623,24 @@ const recordEditorService = services => {
                             $editTimeArea.hide();
                             $editDateArea.css('width',210);
                         }
+
+                        if (field.input_disable) {
+                            $editDateArea.prop('disabled', true);
+                        } else {
+                            $editDateArea.prop('disabled', false);
+                        }
                     } else {
                         $editDateArea.hide();
                         $editTimeArea.hide();
                         $('#idEditDateZone', options.$container).hide();
                         $editTextArea.show();
                         $editTextArea.css('height', '100%');
+
+                        if (field.input_disable) {
+                            $editTextArea.prop('disabled', true);
+                        } else {
+                            $editTextArea.prop('disabled', false);
+                        }
                     }
 
                     $ztextStatus.hide();
@@ -698,6 +710,12 @@ const recordEditorService = services => {
 
                     $editMultiValTextArea.trigger('keyup.maxLength');
 
+                    if (field.input_disable) {
+                        $editMultiValTextArea.prop('disabled', true);
+                    } else {
+                        $editMultiValTextArea.prop('disabled', false);
+                    }
+
                     self.setTimeout(() => $editMultiValTextArea.focus(), 50);
 
                     //      reveal_mval();

diff --git a/lib/Alchemy/Phrasea/Controller/Admin/FieldsController.php b/lib/Alchemy/Phrasea/Controller/Admin/FieldsController.php
@@ -318,6 +318,7 @@ private function updateFieldWithData(\databox_field $field, array $data)
             ->set_gui_editable($data['gui_editable'])
             ->set_gui_visible($data['gui_visible'])
             ->set_printable($data['printable'])
+            ->set_input_disable($data['input_disable'])
             ->set_report($data['report'])
             ->setVocabularyControl(null)
             ->setVocabularyRestricted(false);
@@ -353,7 +354,7 @@ private function getMandatoryFieldProperties()
     {
         return [
             'name', 'multi', 'thumbtitle', 'tag', 'business', 'indexable', 'aggregable',
-            'required', 'separator', 'readonly', 'gui_editable', 'gui_visible' , 'printable', 'type', 'tbranch', 'generate_cterms', 'report',
+            'required', 'separator', 'readonly', 'gui_editable', 'gui_visible' , 'printable', 'input_disable', 'type', 'tbranch', 'generate_cterms', 'report',
             'vocabulary-type', 'vocabulary-restricted', 'dces-element', 'labels'
         ];
     }

diff --git a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php
@@ -629,6 +629,7 @@ private function listDataboxMetadataFieldProperties(\databox_field $databox_fiel
                 'gui_editable'     => $databox_field->get_gui_editable(),
                 'gui_visible'      => $databox_field->get_gui_visible(),
                 'printable'        => $databox_field->get_printable(),
+                'input_disable'    => $databox_field->get_input_disable(),
                 'type'             => $databox_field->get_type(),
                 'indexable'        => $databox_field->is_indexable(),
                 'multivalue'       => $databox_field->is_multi(),

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/EditController.php b/lib/Alchemy/Phrasea/Controller/Prod/EditController.php
@@ -81,6 +81,7 @@ public function submitAction(Request $request)
                     'gui_editable'         => $meta->get_gui_editable(),
                     'gui_visible'          => $meta->get_gui_visible(),
                     'printable'            => $meta->get_printable(),
+                    'input_disable'        => $meta->get_input_disable(),
                     'maxLength'            => $meta->get_tag()
                         ->getMaxLength(),
                     'minLength'            => $meta->get_tag()

diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php
@@ -17,7 +17,7 @@ class Version
      * @var string
      */
 
-    private $number = '4.1.8-rc7';
+    private $number = '4.1.8-rc8';
 
     /**
      * @var string

diff --git a/lib/Alchemy/Phrasea/Databox/Field/DbalDataboxFieldRepository.php b/lib/Alchemy/Phrasea/Databox/Field/DbalDataboxFieldRepository.php
@@ -40,6 +40,7 @@ final class DbalDataboxFieldRepository implements DataboxFieldRepository
         'gui_editable',
         'gui_visible',
         'printable',
+        'input_disable',
     ];
 
     /** @var DataboxFieldFactory */

diff --git a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
@@ -62,7 +62,7 @@ public function getGlobals()
     {
         return [
             // change this version when you change JS file to force the navigation to reload js file
-            'assetFileVersion' => 98
+            'assetFileVersion' => 99
         ];
 
     }

diff --git a/lib/classes/databox.php b/lib/classes/databox.php
@@ -466,6 +466,7 @@ public function feed_meta_fields()
                 ->set_gui_editable((!isset($field['gui_editable']) || (isset($field['gui_editable']) && (string) $field['gui_editable'] == 1)))
                 ->set_gui_visible((!isset($field['gui_visible']) || (isset($field['gui_visible']) && (string) $field['gui_visible'] == 1)))
                 ->set_printable((!isset($field['printable']) || (isset($field['printable']) && (string) $field['printable'] == 1)))
+                ->set_input_disable((isset($field['input_disable']) && (string) $field['input_disable'] == 1))
                 ->set_thumbtitle(isset($field['thumbtitle']) ? (string) $field['thumbtitle'] : (isset($field['thumbTitle']) ? $field['thumbTitle'] : '0'))
                 ->set_report(isset($field['report']) ? (string) $field['report'] : '1')
                 ->save();

diff --git a/lib/classes/databox/field.php b/lib/classes/databox/field.php
@@ -46,6 +46,7 @@ class databox_field implements cache_cacheableInterface
     protected $generate_cterms;
     protected $gui_editable;
     protected $gui_visible;
+    protected $input_disable;
     protected $printable;
     protected $separator;
     protected $thumbtitle;
@@ -174,6 +175,7 @@ protected function loadFromRow(array $row)
         $this->gui_editable = (bool)$row['gui_editable'];
         $this->gui_visible = (bool)$row['gui_visible'];
         $this->printable = (bool)$row['printable'];
+        $this->input_disable = (bool)$row['input_disable'];
         $this->VocabularyType = $row['VocabularyControlType'];
         $this->VocabularyRestriction = (bool)$row['RestrictToVocabularyControl'];
 
@@ -318,6 +320,7 @@ public function save()
           `gui_editable` = :gui_editable,
           `gui_visible` = :gui_visible,
           `printable` = :printable,
+          `input_disable` = :input_disable,
           `sorter` = :position,
           `thumbtitle` = :thumbtitle,
           `VocabularyControlType` = :VocabularyControlType,
@@ -341,10 +344,11 @@ public function save()
             ':report'                => $this->report ? '1' : '0',
             ':type'                  => $this->type,
             ':tbranch'               => $this->tbranch,
-            ':generate_cterms'        => $this->generate_cterms ? '1' : '0',
+            ':generate_cterms'       => $this->generate_cterms ? '1' : '0',
             ':gui_editable'          => $this->gui_editable ? '1' : '0',
-            ':gui_visible'          => $this->gui_visible ? '1' : '0',
+            ':gui_visible'           => $this->gui_visible ? '1' : '0',
             ':printable'             => $this->printable ? '1' : '0',
+            ':input_disable'         => $this->input_disable ? '1' : '0',
             ':position'              => $this->position,
             ':thumbtitle'            => $this->thumbtitle,
             ':VocabularyControlType' => $this->getVocabularyControl() ? $this->getVocabularyControl()->getType() : null,
@@ -400,6 +404,7 @@ public function save()
         $meta->setAttribute('gui_editable', $this->gui_editable ? '1' : '0');
         $meta->setAttribute('gui_visible', $this->gui_visible ? '1' : '0');
         $meta->setAttribute('printable', $this->printable ? '1' : '0');
+        $meta->setAttribute('input_disable', $this->input_disable ? '1' : '0');
         if ($this->multi) {
             $meta->setAttribute('separator', $this->separator);
         }
@@ -775,6 +780,17 @@ public function set_printable($printable)
         return $this;
     }
 
+    /**
+     * @param  boolean       $input_disable
+     * @return databox_field
+     */
+    public function set_input_disable($input_disable)
+    {
+        $this->input_disable = $input_disable;
+
+        return $this;
+    }
+
     /**
      *
      * @param  string        $separator
@@ -895,6 +911,15 @@ public function get_printable()
         return $this->printable;
     }
 
+    /**
+     *
+     * @return boolean
+     */
+    public function get_input_disable()
+    {
+        return $this->input_disable;
+    }
+
     /**
      * @param Boolean $all If set to false, returns a one-char separator to use for serialiation
      *
@@ -1007,8 +1032,9 @@ public function toArray()
             'tbranch'               => $this->tbranch,
             'generate_cterms'        => $this->generate_cterms,
             'gui_editable'          => $this->gui_editable,
-            'gui_visible'          => $this->gui_visible,
+            'gui_visible'           => $this->gui_visible,
             'printable'             => $this->printable,
+            'input_disable'         => $this->input_disable,
             'separator'             => $this->separator,
             'required'              => $this->required,
             'report'                => $this->report,
@@ -1047,10 +1073,10 @@ public static function create(Application $app, databox $databox, $name)
         }
 
         $sql = "INSERT INTO metadatas_structure
-        (`id`, `name`, `src`, `readonly`, `gui_editable`,`gui_visible`, `printable`, `required`, `indexable`, `type`, `tbranch`, `generate_cterms`,
+        (`id`, `name`, `src`, `readonly`, `gui_editable`,`gui_visible`, `printable`, `input_disable`, `required`, `indexable`, `type`, `tbranch`, `generate_cterms`,
           `thumbtitle`, `multi`, `business`, `aggregable`,
           `report`, `sorter`, `separator`)
-        VALUES (null, :name, '', 0, 1, 1, 1, 0, 1, 'string', '', 1,
+        VALUES (null, :name, '', 0, 1, 1, 1, 0, 0, 1, 'string', '', 1,
           null, 0, 0, 0,
            1, :sorter, '')";
 

diff --git a/lib/conf.d/bases_structure.xml b/lib/conf.d/bases_structure.xml
@@ -2073,6 +2073,14 @@
             <default>1</default>
             <comment></comment>
           </field>
+          <field>
+            <name>input_disable</name>
+            <type>int(1) unsigned</type>
+            <null></null>
+            <extra></extra>
+            <default>0</default>
+            <comment></comment>
+          </field>
         </fields>
         <indexes>
           <index>