IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

webui: prefer entity fallback in menu item select

Browse Source 
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>
This commit is contained in:
Petr Vobornik 2015-04-29 17:25:28 +02:00
parent 2be8eeb04f
commit 6bcb90ef36
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install/ui/src/freeipa/Application_controller.js
View File

@ -365,16 +365,16 @@ define([
items = this.menu.query({ entity: facet.entity.name, facet: facet.name }); 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 // entity fallback
if (!items.total && facet.entity) { if (!items.total && facet.entity) {
items = this.menu.query({ entity: facet.entity.name }); items = this.menu.query({ entity: facet.entity.name });
} }
// normal facets
if (!items.total) {
items = this.menu.query({ facet: facet.name });
}
// fallback: Top level item // fallback: Top level item
if (!items.total) { if (!items.total) {
items = this.menu.query({ parent: null }); items = this.menu.query({ parent: null });