Fix EZP-26433: Impossible to select a Content in the UDW search metho…

…d if the UDW is configured to allow a multiple selection
ezpublishlegacy · Oct 17, 2016 · 40797d8 · 40797d8
1 parent fa0a64b
commit 40797d8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/Resources/public/js/views/ez-universaldiscoveryview.js b/Resources/public/js/views/ez-universaldiscoveryview.js
@@ -283,7 +283,7 @@ YUI.add('ez-universaldiscoveryview', function (Y) {
 
                 method.setAttrs({
                     'multiple': this.get('multiple'),
-                    'loadContent': this.get('loadContent'),
+                    'loadContent': true,
                     'startingLocationId': startingLocationId,
                     'visible': visible,
                     'isSelectable': Y.bind(this.get('isSelectable'), this),

diff --git a/Resources/public/js/views/universaldiscovery/ez-universaldiscoverysearchview.js b/Resources/public/js/views/universaldiscovery/ez-universaldiscoverysearchview.js
@@ -110,7 +110,7 @@ YUI.add('ez-universaldiscoverysearchview', function (Y) {
          * @protected
          */
         _searchResultChanged: function () {
-            this.get('selectedView').set('contentStruct', null);
+            this._unselectContent();
             this._uiPageEndLoading();
         },
 
@@ -175,7 +175,8 @@ YUI.add('ez-universaldiscoverysearchview', function (Y) {
                     },
                 });
             } else {
-                this.reset();
+                this.reset('searchResultList');
+                this.render();
             }
         },
 

diff --git a/Tests/js/views/universaldiscovery/assets/ez-universaldiscoverysearchview-tests.js b/Tests/js/views/universaldiscovery/assets/ez-universaldiscoverysearchview-tests.js
@@ -691,7 +691,19 @@ YUI.add('ez-universaldiscoverysearchview-tests', function (Y) {
         },
 
         "Should reset the view if provided search text is empty": function () {
+            var selectContentFired = false;
+
             this.view.set('searchText', 'Grunwald 1410');
+
+            this.view.on('selectContent', function (e) {
+                selectContentFired = true;
+
+                Assert.isNull(
+                    e.selection,
+                    "The selection should be null"
+                );
+            });
+
             this.view.set('searchText', '');
 
             Assert.areEqual(this.view.get('offset'), 0, "The offset attribute should be reset");
@@ -705,6 +717,14 @@ YUI.add('ez-universaldiscoverysearchview-tests', function (Y) {
                 0,
                 "The searchResultList attribute should be reset"
             );
+            Assert.isNull(
+                this.view.get('selectedView').get('contentStruct'),
+                "The contentStruct should be null in the selected view"
+            );
+            Assert.isTrue(
+                selectContentFired,
+                "The selectContent should have been fired"
+            );
         }
     });