From ee12c337a96f3c116e45ff8b5eb2362b639c6cdf Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sun, 6 Jan 2008 21:49:26 +0000
Subject: [PATCH] tracking the rendered page in the core context.  not
 attempting to display object on admin index, where there is no object

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8337 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/oilsweb/oilsweb/lib/__init__.py                            | 1 +
 Open-ILS/web/oilsweb/oilsweb/lib/request.py                             | 1 +
 Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py b/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
index 1012679283..d3bfe1fb14 100644
--- a/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
+++ b/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
@@ -20,6 +20,7 @@ class CoreContext(SubContext):
         self.authtoken = ContextItem(cgi_name='ses', session=True) # authtoken string
         self.user = ContextItem() # logged in user object
         self.workstation = ContextItem() # workstation object
+        self.page = ContextItem() # the current page
 
     def postinit(self):
         import pylons.config
diff --git a/Open-ILS/web/oilsweb/oilsweb/lib/request.py b/Open-ILS/web/oilsweb/oilsweb/lib/request.py
index 7e41443423..eeb5e502c0 100644
--- a/Open-ILS/web/oilsweb/oilsweb/lib/request.py
+++ b/Open-ILS/web/oilsweb/oilsweb/lib/request.py
@@ -38,6 +38,7 @@ class RequestMgr(object):
             would be 'base/dashboard.html'
             '''
         self.finalize()
+        self.ctx.core.page = tpath
         return pylons.templating.render('oils/%s/%s' % (self.ctx.core.skin, tpath))
 
 
diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html
index 03ebdb3edf..fbbc9c5693 100644
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html
@@ -1,7 +1,7 @@
 <span>
     <a href='${c.oils.adm.prefix}/search/${c.oils.adm.object_class}'>${_('Search')}</a>
 </span>
-% if c.oils.adm.mode != 'create':
+% if c.oils.adm.mode != 'create' and c.oils.core.page != 'admin/index.html':
     <span>
         <a href='${c.oils.adm.prefix}/create/${c.oils.adm.object_class}'>${_('Create')}</a>
     </span>
-- 
2.11.0