Merge pull request #839 from ezsystems/Fix-EZP-27059_UDW_should_work_…

…without_correct_visible_method_1.7 Fix EZP-27059: UDW should work without correct visible method
ezsystems · Apr 25, 2017 · fa9e063 · fa9e063
2 parents 4c7fd34 + 62d82f9
commit fa9e063
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/Resources/public/js/views/ez-universaldiscoveryview.js b/Resources/public/js/views/ez-universaldiscoveryview.js
@@ -268,8 +268,12 @@ YUI.add('ez-universaldiscoveryview', function (Y) {
          */
         _updateMethods: function () {
             var visibleMethod = this.get('visibleMethod'),
-                startingLocationId = this.get('startingLocationId');
+                startingLocationId = this.get('startingLocationId'),
+                defaultMethodView;
 
+            if ( !this.get('active') ) {
+                return;
+            }
             /**
              * Stores a reference to the visible method view
              *
@@ -281,6 +285,10 @@ YUI.add('ez-universaldiscoveryview', function (Y) {
             Y.Array.each(this.get('methods'), function (method) {
                 var visible = (visibleMethod === method.get('identifier'));
 
+                if (!visible && (method.get('identifier') === Y.eZ.UniversalDiscoveryView.ATTRS.visibleMethod.value)) {
+                    defaultMethodView = method;
+                }
+
                 method.setAttrs({
                     'multiple': this.get('multiple'),
                     'loadContent': true,
@@ -293,6 +301,11 @@ YUI.add('ez-universaldiscoveryview', function (Y) {
                     this._visibleMethodView = method;
                 }
             }, this);
+
+            if ( !this._visibleMethodView ) {
+                defaultMethodView.set('visible', true);
+                this._visibleMethodView = defaultMethodView;
+            }
         },
 
         /**

diff --git a/Tests/js/views/assets/ez-universaldiscoveryview-tests.js b/Tests/js/views/assets/ez-universaldiscoveryview-tests.js
@@ -401,12 +401,12 @@ YUI.add('ez-universaldiscoveryview-tests', function (Y) {
             this.method1 = new Y.eZ.UniversalDiscoveryMethodBaseView();
             this.method1._set('identifier', 'method1');
             this.method2 = new Y.eZ.UniversalDiscoveryMethodBaseView();
-            this.method2._set('identifier', 'method2');
+            this.method2._set('identifier', Y.eZ.UniversalDiscoveryView.ATTRS.visibleMethod.value);
             this.confirmedList = new Y.View();
             this.view = new Y.eZ.UniversalDiscoveryView({
                 container: '.container',
                 title: this.title,
-                visibleMethod: 'method2',
+                visibleMethod: Y.eZ.UniversalDiscoveryView.ATTRS.visibleMethod.value,
                 multiple: this.multiple,
                 methods: [this.method1, this.method2],
                 confirmedListView: this.confirmedList,
@@ -425,6 +425,7 @@ YUI.add('ez-universaldiscoveryview-tests', function (Y) {
         },
 
         "Should initialize the visibility flag of the method views": function () {
+            this.view.set('visibleMethod', 'method2');
             this.view.render();
             this.view.set('active', true);
             Assert.isTrue(
@@ -438,6 +439,7 @@ YUI.add('ez-universaldiscoveryview-tests', function (Y) {
         },
 
         "Should change the visible flag depending on visibleMethod": function () {
+            this.view.set('active', true);
             this.view.set('visibleMethod', 'method1');
             Assert.isTrue(
                 this.method1.get('visible'),
@@ -449,6 +451,24 @@ YUI.add('ez-universaldiscoveryview-tests', function (Y) {
             );
         },
 
+        "Should change the visible flag depending on visibleMethod if view is NOT active": function () {
+            this.view.set('visibleMethod', 'method1');
+            Assert.isFalse(
+                this.method1.get('visible'),
+                "The method1 should NOT be visible"
+            );
+        },
+
+        "Should use the default visible method when a wrong method name is setted": function () {
+            this.view.render();
+            this.view.set('active', true);
+            this.view.set('visibleMethod', 'methodUnknown');
+            Assert.isTrue(
+                this.method2.get('visible'),
+                "The method2 should not be visible"
+            );
+        },
+
         "Should initialize the isSelected function of the method views": function () {
             var isSelectableResult = false,
                 isSelectable = function (contentStruct) {return isSelectableResult;},