git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@120 6d9bc8c9-1ec2-4278...

diff --git a/conifer/templates/search_results.xhtml b/conifer/templates/search_results.xhtml
index 69ec36e..0bbbe33 100644 (file)
--- a/conifer/templates/search_results.xhtml
+++ b/conifer/templates/search_results.xhtml
@@ -36,7 +36,7 @@ courses = course_list
         </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>

diff --git a/conifer/urls.py b/conifer/urls.py
index a320d71..101ed39 100644 (file)
--- a/conifer/urls.py
+++ b/conifer/urls.py
@@ -11,7 +11,7 @@ urlpatterns = patterns('',
 
     # 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),