[open-ils-commits] r306 - in servres/trunk/conifer: . syrup templates (gfawcett)

[svn at svn.open-ils.org]

Author: gfawcett
Date: 2009-04-08 15:20:17 -0400 (Wed, 08 Apr 2009)
New Revision: 306

Modified:
   servres/trunk/conifer/genshi_namespace.py
   servres/trunk/conifer/syrup/views.py
   servres/trunk/conifer/templates/instructors.xhtml
Log:
fixed more root-related problems


Modified: servres/trunk/conifer/genshi_namespace.py
===================================================================
--- servres/trunk/conifer/genshi_namespace.py	2009-04-08 18:42:41 UTC (rev 305)
+++ servres/trunk/conifer/genshi_namespace.py	2009-04-08 19:20:17 UTC (rev 306)
@@ -9,11 +9,11 @@
 
 # this probably ought to be a method on User, or another model class.
 def instructor_url(instructor, suffix=''):
-    return '/syrup/instructor/%d/%s' % (instructor.id, suffix)
+    return '/instructor/%d/%s' % (instructor.id, suffix)
 
 # added to make department browse
 def department_url(department, suffix=''):
-    return '/syrup/department/%d/%s' % (department.id, suffix)
+    return '/department/%d/%s' % (department.id, suffix)
 
 
 def call_or_value(obj, dflt=None):

Modified: servres/trunk/conifer/syrup/views.py
===================================================================
--- servres/trunk/conifer/syrup/views.py	2009-04-08 18:42:41 UTC (rev 305)
+++ servres/trunk/conifer/syrup/views.py	2009-04-08 19:20:17 UTC (rev 306)
@@ -136,7 +136,7 @@
 def _access_denied(request, message):
     if request.user.is_anonymous():
         # then take them to login screen....
-        dest = request.META['SCRIPT_NAME'] + '/accounts/login/?next=' + request.environ['PATH_INFO']
+        dest = request.META['SCRIPT_NAME'] + '/accounts/login/?next=' + request.META['PATH_INFO']
         return HttpResponseRedirect(dest)
     else:
         return simple_message(_('Access denied.'), message,

Modified: servres/trunk/conifer/templates/instructors.xhtml
===================================================================
--- servres/trunk/conifer/templates/instructors.xhtml	2009-04-08 18:42:41 UTC (rev 305)
+++ servres/trunk/conifer/templates/instructors.xhtml	2009-04-08 19:20:17 UTC (rev 306)
@@ -19,7 +19,7 @@
     <th>Name</th>
   </tr>
   <span py:def="pagerow(user)">
-    <td><a href="${instructor_url(user)}">${user.last_name}, ${user.first_name}</a></td>
+    <td><a href="${ROOT}${instructor_url(user)}">${user.last_name}, ${user.first_name}</a></td>
   </span>
   ${pagetable(paginator, count, pagerow, pageheader)}
 </body>