summaryrefslogtreecommitdiff
path: root/gnowsys-ndf/gnowsys_ndf
diff options
context:
space:
mode:
authoradmin <admin@krishna-K55VM.(none)>2015-02-12 14:58:24 +0530
committeradmin <admin@krishna-K55VM.(none)>2015-02-12 14:58:24 +0530
commit685619c8b0e6935149fbe1c78294f8013f9cb05c (patch)
tree10f78ea1efdfd8ec793b20b2b3464706dbe230d5 /gnowsys-ndf/gnowsys_ndf
parentb2fae56d21f8ab9683bd11b1e44526ae61b3ab8e (diff)
parent8ba9761a88a55d11d2506025fa8f1a32ed6cc6b3 (diff)
downloadgnowsys-685619c8b0e6935149fbe1c78294f8013f9cb05c.tar.gz
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into reschedule_date
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf')
-rw-r--r--gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py b/gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py
index cd9f40d..16bfe5f 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py
@@ -646,6 +646,7 @@ def get_nroer_menu(request, group_name):
temp_val = each_gapp.values()[0]
if temp_val == selected_gapp:
nroer_menu_dict["selected_gapp"] = temp_val
+ break
# print "selected_gapp : ", selected_gapp
@@ -664,11 +665,9 @@ def get_nroer_menu(request, group_name):
# for Partners, "Curated Zone" should not appear
gapps = gapps[1:] if top_menu_selected == "Partners" else gapps
- elif (len(url_split) >= 3) and ("agency_type" in url_split):
- top_menu_selected = "Partners" if (url_split[3] == "Partner") else ""
- gapps = ""
- elif (len(url_split) >= 2) and ("nroer_groups" in url_split):
- top_menu_selected = "Groups" if (url_split[2] == "nroer_groups") else ""
+
+ elif (len(url_split) >= 3) and ("nroer_groups" in url_split) and (url_split[2] in [i.keys()[0] for i in GSTUDIO_NROER_MENU[1:]]):
+ top_menu_selected = url_split[2]
gapps = ""
# elif - put this for sub groups. Needs to fire queries etc. for future perspective.