fixed over-specialization bug in generics.py.

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

diff --git a/conifer/syrup/generics.py b/conifer/syrup/generics.py
index 5b81962..2b2e3e0 100644 (file)
--- a/conifer/syrup/generics.py
+++ b/conifer/syrup/generics.py
@@ -25,7 +25,7 @@ def generic_edit(form, request, obj_id):
             return HttpResponseRedirect('../')
 
 def generic_delete(form, request, obj_id):
-    instance = get_object_or_404(models.Term, pk=obj_id)
+    instance = get_object_or_404(form.Meta.model, pk=obj_id)
     if request.method != 'POST':
         form = form(instance=instance)
         return g.render('generic/delete.xhtml', **locals())

diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py
index 5e795c0..8fa1f50 100644 (file)
--- a/conifer/syrup/models.py
+++ b/conifer/syrup/models.py
@@ -405,6 +405,9 @@ class NewsItem(m.Model):
                                       ('markdown', _('Markdown'))),
                            default = 'html')
 
+    def __unicode__(self):
+        return u'%s (%s)' % (self.subject, self.published)
+
     def generated_body(self):
         if self.encoding == 'plain':
             return self.body