From 9a03ad118e22ea8e4562e5c20a88ad1b396456a7 Mon Sep 17 00:00:00 2001
From: artunit <artunit@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Tue, 17 Mar 2009 17:39:07 +0000
Subject: [PATCH] removed extraneous admin entry point for courses and items

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@196 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---
 conifer/syrup/urls.py               |  2 --
 conifer/syrup/views.py              | 34 ++--------------------------------
 conifer/templates/admin/index.xhtml |  2 --
 3 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/conifer/syrup/urls.py b/conifer/syrup/urls.py
index c3ff691..35890ab 100644
--- a/conifer/syrup/urls.py
+++ b/conifer/syrup/urls.py
@@ -36,8 +36,6 @@ urlpatterns = patterns('conifer.syrup.views',
     (ITEM_PREFIX + r'add/$', 'item_add'), # for adding sub-things
     (r'^admin/$', 'admin_index'),
     (r'^admin/terms/' + GENERIC_REGEX, 'admin_terms'),
-    (r'^admin/courses/' + GENERIC_REGEX, 'admin_courses'),
-    (r'^admin/items/' + GENERIC_REGEX, 'admin_items'),
     (r'^admin/depts/' + GENERIC_REGEX, 'admin_depts'),
     (r'^admin/news/' + GENERIC_REGEX, 'admin_news'),
     (r'^admin/targets/' + GENERIC_REGEX, 'admin_targets'),
diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py
index acf3051..4006d70 100644
--- a/conifer/syrup/views.py
+++ b/conifer/syrup/views.py
@@ -838,7 +838,6 @@ def zsearch(request):
         print("results are %d" % len(res))
         collector = [(None,None)] * len(res)
 
-        # we fudge this since it has more overhead 
         start = (page_num - 1) * count
         end = (page_num * count) + 1
 
@@ -880,7 +879,8 @@ def zsearch(request):
                 #collector.append ((bibid, unicode(title, 'ascii', 'ignore')))
 
                 collector.pop(idx)
-                collector.insert (idx,(bibid, unicode(title, 'ascii', 'ignore')))
+                # collector.insert (idx,(bibid, unicode(title, 'ascii', 'ignore')))
+                collector.insert (idx,(bibid, unicode(title, 'utf-8', 'ignore')))
             idx+=1
 
         conn.close ()
@@ -942,36 +942,6 @@ admin_depts = generic_handler(DeptForm, decorator=admin_only)
 ###
 # graham - zap this if it messes anything up :-)
 ###
-class CourseForm(ModelForm):
-    class Meta:
-        model = models.Course
-
-    class Index:
-        title = _('Courses')
-        all   = models.Course.objects.order_by('code').all
-        cols  = ['code', 'title']
-        links = [0,1]
-
-    clean_code = strip_and_nonblank('code')
-    clean_title = strip_and_nonblank('title')
-
-admin_courses = generic_handler(CourseForm, decorator=admin_only)
-
-class ItemForm(ModelForm):
-    class Meta:
-        model = models.Item
-
-    class Index:
-        title = _('Items')
-        all   = models.Item.objects.order_by('title').all
-        cols  = ['title', 'author']
-        links = [0,1]
-
-    clean_title = strip_and_nonblank('title')
-    clean_author = strip_and_nonblank('author')
-
-admin_items = generic_handler(ItemForm, decorator=admin_only)
-
 class TargetForm(ModelForm):
     class Meta:
         model = models.Target
diff --git a/conifer/templates/admin/index.xhtml b/conifer/templates/admin/index.xhtml
index 84397b4..d5ff32c 100644
--- a/conifer/templates/admin/index.xhtml
+++ b/conifer/templates/admin/index.xhtml
@@ -17,12 +17,10 @@ title = _('Administrative Options')
     <li><a href="terms/">Terms</a></li>
     <li><a href="depts/">Departments</a></li>
     <li><a href="courses/">Courses</a></li>
-    <li><a href="items/">Items</a></li>
     <li><a href="news/">News Items</a></li>
   </ul>
   <ul>
     <li><a href="targets/">Manage Z39.50 Targets</a></li>
-    <!-- not sure if this is an admin option yet -->
     <li><a href="../zsearch/">Search Z39.50 Targets</a></li>
   </ul>
 </body>
-- 
2.11.0