[open-ils-commits] r120 - in servres/trunk/conifer: . templates

[svn at svn.open-ils.org]

Author: artunit
Date: 2009-01-26 13:43:17 -0500 (Mon, 26 Jan 2009)
New Revision: 120

Modified:
   servres/trunk/conifer/templates/search_results.xhtml
   servres/trunk/conifer/urls.py
Log:


Modified: servres/trunk/conifer/templates/search_results.xhtml
===================================================================
--- servres/trunk/conifer/templates/search_results.xhtml	2009-01-26 00:12:53 UTC (rev 119)
+++ servres/trunk/conifer/templates/search_results.xhtml	2009-01-26 18:43:17 UTC (rev 120)
@@ -36,7 +36,7 @@
         </tr>
         <tr py:for="instructor in instructors">
             <td>${Markup(instructor.instr_name_hl(norm_query))}</td>
-            <td>foo</td>
+            <td>${instructor.user.first_name}</td>
         </tr>
         <tr py:if="instr_len > count">
         <td></td>

Modified: servres/trunk/conifer/urls.py
===================================================================
--- servres/trunk/conifer/urls.py	2009-01-26 00:12:53 UTC (rev 119)
+++ servres/trunk/conifer/urls.py	2009-01-26 18:43:17 UTC (rev 120)
@@ -11,7 +11,7 @@
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
     # to INSTALLED_APPS to enable admin documentation:
-    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
     # Uncomment the next line to enable the admin:
     (r'^admin/(.*)', admin.site.root),