From 31317abbeb358e1e25abfd16f7f4dbf999c95933 Mon Sep 17 00:00:00 2001 From: Othyus Date: Tue, 28 Jun 2016 08:11:37 +0200 Subject: [PATCH] feat(sidemenu): add limit for shown organizations --- public/app/core/components/sidemenu/sidemenu.html | 5 ++++- public/app/core/components/sidemenu/sidemenu.ts | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html index fbcc8034f94..8c14eb72976 100644 --- a/public/app/core/components/sidemenu/sidemenu.html +++ b/public/app/core/components/sidemenu/sidemenu.html @@ -22,7 +22,10 @@ {{::menuItem.text}} -
  • +
  • + + Max shown : {{::ctrl.maxShownOrgs}} +
  • diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts index 686f7a8478e..0c5f44b3a62 100644 --- a/public/app/core/components/sidemenu/sidemenu.ts +++ b/public/app/core/components/sidemenu/sidemenu.ts @@ -15,6 +15,7 @@ export class SideMenuCtrl { orgFilter: string; orgItems: any; orgs: any; + maxShownOrgs: number; /** @ngInject */ constructor(private $scope, private $location, private contextSrv, private backendSrv, private $element) { @@ -22,7 +23,7 @@ export class SideMenuCtrl { this.user = contextSrv.user; this.appSubUrl = config.appSubUrl; this.showSignout = this.contextSrv.isSignedIn && !config['authProxyEnabled']; - + this.maxShownOrgs = 10; this.mainLinks = config.bootData.mainNavLinks; this.openUserDropdown(); @@ -79,7 +80,7 @@ export class SideMenuCtrl { return; } - if (this.orgFilter === '' || org.name.indexOf(this.orgFilter) !== -1){ + if (this.orgItems.length < this.maxShownOrgs && (this.orgFilter === '' || org.name.indexOf(this.orgFilter) !== -1)){ this.orgItems.push({ text: "Switch to " + org.name, icon: "fa fa-fw fa-random",