constrain Member class: (course,user) must be unique.

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

diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py
index 673d642..44646c9 100644 (file)
--- a/conifer/syrup/models.py
+++ b/conifer/syrup/models.py
@@ -291,6 +291,9 @@ def section_encode_safe(section):
     return course_sections.sections_tuple_delimiter.join(section).encode('base64').strip()
 
 class Member(m.Model):
+    class Meta:
+        unique_together = (('course', 'user'))
+
     course = m.ForeignKey(Course)
     user = m.ForeignKey(User)
     role = m.CharField(

diff --git a/conifer/templates/edit_course_permissions.xhtml b/conifer/templates/edit_course_permissions.xhtml
index ab8f15c..a921da7 100644 (file)
--- a/conifer/templates/edit_course_permissions.xhtml
+++ b/conifer/templates/edit_course_permissions.xhtml
@@ -28,7 +28,7 @@ instructors = [m for m in models.Member.objects.filter(course=course) if m.role
                            [(u'INSTR',_(u'Instructor')), (u'PROXY', _(u'Proxy instructor'))])
                            .render('instructor_role_%d' % mbr.id, mbr.role))"/>
       <tr py:for="mbr in instructors">
-       <td>${mbr.user.get_full_name() or mbr.user}</td>
+       <td>${mbr.user.get_full_name() or ''} <code>(${mbr.user.username})</code></td>
        <td>${select_role(mbr)}</td>
        <td><input type="checkbox" name="instructor_remove_${mbr.id}"/></td>
       </tr>