webui: prefer entity fallback in menu item select

While selecting menu item based on a facet which have an entity defined,
prefer entity fallback over facet name fallback.

It solves an issue which appears when a menu item of a different entity
has the same facet name specified. In such case this menu item was selected
instead of the desired one.

E.g.: there are menu items:
  { entity: 'foo' }
  { entity: 'bar', facet: 'search'}

Showing a foo's search facet resulted in selecting
{ entity: 'bar', facet: 'search'} item.

Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Thierry Bordaz <tbordaz@redhat.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/install/ui/src/freeipa/Application_controller.js b/install/ui/src/freeipa/Application_controller.js
index 4bf76f8f5..5877ed63e 100644
--- a/install/ui/src/freeipa/Application_controller.js
+++ b/install/ui/src/freeipa/Application_controller.js
@@ -365,16 +365,16 @@ define([
                 items = this.menu.query({ entity: facet.entity.name, facet: facet.name });
             }
 
-            // normal facets
-            if (!items.total) {
-                items = this.menu.query({ facet: facet.name });
-            }
-
             // entity fallback
             if (!items.total && facet.entity) {
                 items = this.menu.query({ entity: facet.entity.name });
             }
 
+            // normal facets
+            if (!items.total) {
+                items = this.menu.query({ facet: facet.name });
+            }
+
             // fallback: Top level item
             if (!items.total) {
                 items = this.menu.query({ parent: null });