[open-ils-commits] r8337 - in branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb: lib templates/oils/default/admin

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-01-06 16:49:26 -0500 (Sun, 06 Jan 2008)
New Revision: 8337

Modified:
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/request.py
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html
Log:
tracking the rendered page in the core context.  not attempting to display object on admin index, where there is no object

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py	2008-01-06 21:06:50 UTC (rev 8336)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py	2008-01-06 21:49:26 UTC (rev 8337)
@@ -20,6 +20,7 @@
         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

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/request.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/request.py	2008-01-06 21:06:50 UTC (rev 8336)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/request.py	2008-01-06 21:49:26 UTC (rev 8337)
@@ -38,6 +38,7 @@
             would be 'base/dashboard.html'
             '''
         self.finalize()
+        self.ctx.core.page = tpath
         return pylons.templating.render('oils/%s/%s' % (self.ctx.core.skin, tpath))
 
 

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html	2008-01-06 21:06:50 UTC (rev 8336)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html	2008-01-06 21:49:26 UTC (rev 8337)
@@ -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>