From aedded862dce2c8450d0eef5eca3d854166af06b Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: May 06 2013 14:22:31 +0000 Subject: Enable standalone facets in menu.add_item https://fedorahosted.org/freeipa/ticket/3235 --- diff --git a/install/ui/src/freeipa/navigation/Menu.js b/install/ui/src/freeipa/navigation/Menu.js index c58e05d..677171d 100644 --- a/install/ui/src/freeipa/navigation/Menu.js +++ b/install/ui/src/freeipa/navigation/Menu.js @@ -25,9 +25,9 @@ define(['dojo/_base/declare', 'dojo/_base/lang', 'dojo/store/Observable', 'dojo/Evented', - '../text', - '../ipa' // TODO: remove dependance - ], function(declare, Memory_store, array, lang, Observable, Evented, text, IPA) { + '../reg', + '../text' + ], function(declare, Memory_store, array, lang, Observable, Evented, reg, text) { /** * Menu store @@ -113,21 +113,21 @@ return declare([Evented], { if (item.title) item.title = text.get(item.title); if (item.entity) { - // FIXME: replace with 'entities' module in future - var entity = IPA.get_entity(item.entity); + var entity = reg.entity.get(item.entity); if (!entity) { return false; //quit } - //item.name = entity.name; if (!item.label) item.label = entity.label; if (!item.title) item.title = entity.title; - } //else if (item.facet) { - // TODO: uncomment when facet repository implemented -// var facet = facets.(item.facet); -// item.name = facet.name; -// if (!item.label) item.label = facet.label; -// if (!item.title) item.title = facet.title; -// } + } else if (item.facet) { + var facet = reg.facet.get(item.facet); + if (!facet) { + return false; //quit + } + item.name = facet.name; + if (!item.label) item.label = facet.label; + if (!item.title) item.title = facet.title; + } item.selected = false; @@ -152,7 +152,7 @@ return declare([Evented], { item.name = parent.name + this.path_delimiter + item.name; } - // children will be added separatelly + // children will be added separately var children = item.children; delete item.children;