From 1acac3f915d3f14ff24a4b6b2e9c429e711fee79 Mon Sep 17 00:00:00 2001
From: artunit <artunit@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Wed, 19 Nov 2008 20:57:18 +0000
Subject: [PATCH] git-svn-id:
 svn://svn.open-ils.org/ILS-Contrib/servres/trunk@26
 6d9bc8c9-1ec2-4278-b937-99fde70a366f

---
 conifer/syrup/admin.py          |   2 +-
 conifer/syrup/direct_models.py  | 487 ++++++++++++++++++++++------------------
 conifer/syrup/models.py         |   3 +-
 conifer/templates/welcome.xhtml |   2 +-
 4 files changed, 277 insertions(+), 217 deletions(-)

diff --git a/conifer/syrup/admin.py b/conifer/syrup/admin.py
index c24d19f..d9d46da 100644
--- a/conifer/syrup/admin.py
+++ b/conifer/syrup/admin.py
@@ -22,5 +22,5 @@ from conifer.syrup.models import *
 #             value.__unicode__ = unicode_fn(firstcharfield)
 #         admin.site.register(value)
 
-for m in [Member, Course, Term, UserProfile, News]:
+for m in [Member, Course, Term, UserProfile, NewsItem]:
     admin.site.register(m)
diff --git a/conifer/syrup/direct_models.py b/conifer/syrup/direct_models.py
index 3b1752b..ac2dce6 100644
--- a/conifer/syrup/direct_models.py
+++ b/conifer/syrup/direct_models.py
@@ -1,217 +1,249 @@
-# Fairly straight mapping of Reserves Direct tables
+# fairly straight mapping of Reserves Direct tables
 # a couple of additions as noted below
 
 from django.db import models
 
 class User(models.Model):
-    username              = models.CharField(max_length=200,db_index=True)
-    first_name            = models.CharField(max_length=255,db_index=True)
-    last_name             = models.CharField(max_length=255,db_index=True)
-    email                 = models.EmailField()
+    username = models.CharField(max_length=200,db_index=True)
+    first_name = models.CharField(max_length=255,db_index=True)
+    last_name = models.CharField(max_length=255,db_index=True)
+    email = models.EmailField()
     dflt_permission_level = models.IntegerField(default=0)
-    last_login            = models.DateTimeField(auto_now=False)
-    old_id                = models.IntegerField(null=True)
-    old_user_id           = models.IntegerField(null=True)
-
-class Library(models.Model):
-    name                  = models.CharField(max_length=100)
-    nickname              = models.CharField(max_length=15,blank=True,default='')
-    ils_prefix            = models.CharField(max_length=10,blank=True,default='')
-    reserve_desk          = models.CharField(max_length=50,blank=True,default='')
-    url                   = models.URLField()
-    contact_email         = models.EmailField()
+    last_login = models.DateTimeField(auto_now=False,null=True,blank=True)
+    old_id = models.IntegerField(null=True,blank=True)
+    old_user_id = models.IntegerField(null=True,blank=True)
+
+    def __unicode__(self):
+        return self.username
+
+class LibraryUnit(models.Model):
+    name = models.CharField(max_length=100)
+    nickname = models.CharField(max_length=15,blank=True,default='')
+    ils_prefix = models.CharField(max_length=10,blank=True,default='')
+    reserve_desk = models.CharField(max_length=50,blank=True,default='')
+    url = models.URLField()
+    contact_email = models.EmailField()
     #not sure i understand this, guessing that this is a related library for material type
-    copyright_library_id  = models.IntegerField(null=True)
-    monograph_library_id  = models.IntegerField(null=True)
-    multimedia_library_id = models.IntegerField(null=True)
+    copyright_library_id = models.IntegerField(null=True,blank=True)
+    monograph_library_id = models.IntegerField(null=True,blank=True)
+    multimedia_library_id = models.IntegerField(null=True,blank=True)
+
+    def __unicode__(self):
+        return self.name
 
 class Item(models.Model):
-    title             = models.CharField(max_length=255,null=True,db_index=True) 
-    author            = models.CharField(max_length=255,null=True,db_index=True) 
-    source            = models.CharField(max_length=255,null=True,db_index=True) 
-    volume_title      = models.CharField(max_length=255,null=True,db_index=True) 
-    content_notes     = models.CharField(max_length=255,null=True)
-    volume_edition    = models.CharField(max_length=255,null=True) 
-    content_notes     = models.CharField(max_length=255,null=True) 
-    volume_edition    = models.CharField(max_length=255,null=True) 
-    pages_times       = models.CharField(max_length=255,null=True) 
-    performer         = models.CharField(max_length=255,null=True,db_index=True) 
-    local_control_key = models.CharField(max_length=30,null=True) 
-    creation_date     = models.DateField(auto_now=False)
-    last_modified     = models.DateField(auto_now=False)
-    url               = models.URLField()
-    mime_type         = models.CharField(max_length=100,default='text/html')
-    home_library      = models.ForeignKey(Library,related_name='home_library')
-    private_user_id   = models.IntegerField(null=True)
-    item_group        = models.CharField(max_length=25,default='0')
+    title = models.CharField(max_length=255,db_index=True) 
+    author = models.CharField(max_length=255,db_index=True) 
+    source = models.CharField(max_length=255,db_index=True) 
+    volume_title = models.CharField(max_length=255,db_index=True) 
+    content_notes = models.CharField(max_length=255)
+    volume_edition = models.CharField(max_length=255) 
+    content_notes = models.CharField(max_length=255) 
+    volume_edition = models.CharField(max_length=255) 
+    pages_times = models.CharField(max_length=255) 
+    performer = models.CharField(max_length=255,db_index=True) 
+    local_control_key = models.CharField(max_length=30) 
+    creation_date = models.DateField(auto_now=False)
+    last_modified = models.DateField(auto_now=False)
+    url = models.URLField()
+    mime_type = models.CharField(max_length=100,default='text/html')
+    home_library = models.ForeignKey(LibraryUnit,related_name='home_library')
+    private_user_id = models.IntegerField(null=True,blank=True)
+    item_group = models.CharField(max_length=25,default='0')
     ITEM_TYPE_CHOICES = (
         ('ITEM', 'Item'),
         ('HEADING', 'Heading')
     )
-    item_type         = models.CharField(max_length=7, 
-        choices       = ITEM_TYPE_CHOICES,
-        default       = 'ITEM'
+    item_type = models.CharField(max_length=7, 
+        choices=ITEM_TYPE_CHOICES,
+        default='ITEM'
     )
-    item_icon         = models.CharField(max_length=255,null=True) 
-    ISBN              = models.CharField(max_length=13,null=True,db_index=True) 
-    ISSN              = models.CharField(max_length=8,null=True,db_index=True) 
-    OCLC              = models.CharField(max_length=9,null=True,db_index=True) 
-    old_id            = models.IntegerField(null=True)
+    item_icon = models.CharField(max_length=255) 
+    ISBN = models.CharField(max_length=13,db_index=True) 
+    ISSN = models.CharField(max_length=8,db_index=True) 
+    OCLC = models.CharField(max_length=9,db_index=True) 
+    old_id = models.IntegerField(null=True,blank=True)
+
+    def __unicode__(self):
+        return self.title
 
 
 class Department(models.Model):
-    library      = models.ForeignKey(Library)
-    abbreviation = models.CharField(max_length=8,null=True,db_index=True) 
-    name         = models.TextField(db_index=True)
-    status       = models.IntegerField(null=True)
+    library = models.ForeignKey(LibraryUnit)
+    abbreviatopn = models.CharField(max_length=8,db_index=True) 
+    name = models.TextField(db_index=True)
+    status = models.IntegerField(null=True,blank=True)
+
+    def __unicode__(self):
+        return self.name
 
 class Course(models.Model):
-    department        = models.ForeignKey(Department)
-    course_number     = models.CharField(max_length=50,null=True,db_index=True) 
-    course_name       = models.TextField()
-    uniform_title     = models.TextField(db_index=True)
-    old_id            = models.IntegerField(null=True,db_index=True)
-    dept_abv          = models.CharField(max_length=50,blank=True,default='')
+    department = models.ForeignKey(Department)
+    course_number = models.CharField(max_length=50,db_index=True) 
+    course_name = models.TextField()
+    uniform_title = models.TextField(db_index=True)
+    old_id = models.IntegerField(null=True,blank=True,db_index=True)
+    dept_abv = models.CharField(max_length=50,blank=True,default='')
     old_course_number = models.CharField(max_length=50,blank=True,default='')
 
+    def __unicode__(self):
+        return self.course_name
+
 class CourseNoDept(models.Model):
-    course_number     = models.CharField(max_length=50,null=True) 
-    course_name       = models.TextField()
-    uniform_title     = models.BooleanField(default=True)
-    old_id            = models.IntegerField(null=True,db_index=True)
-    dept_abv          = models.CharField(max_length=50,blank=True,default='')
+    course_number = models.CharField(max_length=50) 
+    course_name = models.TextField()
+    uniform_title = models.BooleanField(default=True)
+    old_id = models.IntegerField(null=True,blank=True,db_index=True)
+    dept_abv = models.CharField(max_length=50,blank=True,default='')
     old_course_number = models.CharField(max_length=50,blank=True,default='')
 
+    def __unicode__(self):
+        return self.course_number
+
 class CourseInstance(models.Model):
-    primary_course_alias_id = models.IntegerField(null=True)
-    term                    = models.CharField(max_length=12,blank=True,default='')
-    year                    = models.IntegerField(default=0)
-    activation_date         = models.DateTimeField(auto_now=False,db_index=True)
-    expiration_date         = models.DateTimeField(auto_now=False,db_index=True)
-    STATUS_CHOICES          = (
+    primary_course_alias_id = models.IntegerField(null=True,blank=True)
+    term = models.CharField(max_length=12,blank=True,default='')
+    year = models.IntegerField(default=0)
+    activation_date = models.DateTimeField(auto_now=False,db_index=True)
+    expiration_date = models.DateTimeField(auto_now=False,db_index=True)
+    STATUS_CHOICES = (
         ('ACTIVE', 'Active'),
         ('INACTIVE', 'InActive'),
         ('INPROGRESS', 'In Progress'),
         ('AUTOFEED', 'AutoFeed'),
         ('CANCELLED', 'Cancelled')
     )
-    status                  = models.CharField(max_length=10, 
-        blank               = True,
-        choices             = STATUS_CHOICES, 
-        default             = ''
+    status = models.CharField(max_length=10, 
+        blank=True,
+        choices=STATUS_CHOICES, 
+        default=''
     )
-    ENROLLMENT_CHOICES      = (
+    ENROLLMENT_CHOICES = (
         ('OPEN', 'Open'),
         ('MODERATED', 'Moderated'),
         ('CLOSED', 'Closed')
     )
-    enrollment              = models.CharField(max_length=9, 
-        choices             = ENROLLMENT_CHOICES, 
-        default             = 'OPEN'
+    enrollment = models.CharField(max_length=9, 
+        choices=ENROLLMENT_CHOICES, 
+        default='OPEN'
     )
-    reviewed_date           = models.DateTimeField(auto_now=False)
+    reviewed_date = models.DateTimeField(auto_now=False)
     #what number does this refer to, maybe institutional?
-    reviewed_by             = models.IntegerField(null=True)
+    reviewed_by = models.IntegerField(null=True,blank=True)
+
+class CourseAliasIdent(models.Model):
+    course = models.ForeignKey(Course)
+    course_name = models.CharField(max_length=200,db_index=True)
+    course_instance_id = models.IntegerField(null=True,blank=True)
+    course_name = models.TextField()
+    section = models.CharField(max_length=25) 
+    registrar_key = models.CharField(max_length=255) 
 
-class CourseAlias(models.Model):
-    course             = models.ForeignKey(Course)
-    course_name        = models.CharField(max_length=200,db_index=True)
-    course_instance_id = models.IntegerField(null=True)
-    course_name        = models.TextField()
-    section            = models.CharField(max_length=25,null=True) 
-    registrar_key      = models.CharField(max_length=255,null=True) 
+    def __unicode__(self):
+        return self.course_name
 
 class PermissionsLevel(models.Model):
     label = models.CharField(max_length=25)
 
-class Access(models.Model):
-    user                      = models.ForeignKey(User)
-    course_alias              = models.ForeignKey(CourseAlias)
-    permissions_level         = models.IntegerField(default=0, db_index=True)
+    def __unicode__(self):
+        return self.label
+
+class AccessLevel(models.Model):
+    user = models.ForeignKey(User)
+    course_alias = models.ForeignKey(CourseAliasIdent)
+    permissions_level = models.IntegerField(default=0, db_index=True)
     ENROLLMENT_STATUS_CHOICES = (
         ('AUTOFEED', 'AutoFeed'),
         ('APPROVED', 'Approved'),
         ('PENDING', 'Pending'),
         ('DENIED', 'Denied')
     )
-    enrollment_status         = models.CharField(max_length=8, 
-        choices               = ENROLLMENT_STATUS_CHOICES, 
-        default               = 'PENDING'
+    enrollment_status = models.CharField(max_length=8, 
+        choices=ENROLLMENT_STATUS_CHOICES, 
+        default='PENDING'
     )
-    autofeed_run_indicator    = models.CharField(max_length=20,null=True)
+    autofeed_run_indicator = models.CharField(max_length=20)
 
-class CircRules(models.Model):
-    circ_rule        = models.CharField(max_length=50,blank=True,default='')
-    alt_circ_rule    = models.CharField(max_length=50,blank=True,default='')
+class CircRule(models.Model):
+    circ_rule = models.CharField(max_length=50,blank=True,default='')
+    alt_circ_rule = models.CharField(max_length=50,blank=True,default='')
     default_selected = models.BooleanField(default=False)
 
+    def __unicode__(self):
+        return self.circ_rule
+
 class ElectronicItemAudit(models.Model):
-    item_id       = models.IntegerField(default=0)
-    date_added    = models.DateField(auto_now_add=True)
+    item_id = models.IntegerField(default=0)
+    date_added = models.DateField(auto_now_add=True)
     date_reviewed = models.DateField(auto_now=False)
-    added_by      = models.IntegerField(null=True)
-    reviewed_by   = models.IntegerField(null=True)
+    added_by = models.IntegerField(null=True,blank=True)
+    reviewed_by = models.IntegerField(null=True,blank=True)
 
 class Reserve(models.Model):
-    course_instance       = models.ForeignKey(CourseInstance)
-    item                  = models.ForeignKey(Item)
-    activation_date       = models.DateField(auto_now=False)
-    STATUS_CHOICES        = (
+    course_instance = models.ForeignKey(CourseInstance)
+    item = models.ForeignKey(Item)
+    activation_date = models.DateField(auto_now=False)
+    STATUS_CHOICES = (
         ('ACTIVE', 'Active'),
         ('INACTIVE', 'InActive'),
         ('INPROCESS', 'In Process')
     )
-    status                = models.CharField(max_length=9, 
-        blank             = True,
-        choices           = STATUS_CHOICES, 
-        default           = ''
+    status = models.CharField(max_length=9, 
+        blank=True,
+        choices=STATUS_CHOICES, 
+        default=''
     )
-    expiration            = models.DateField(auto_now=False)
-    date_created          = models.DateTimeField(auto_now_add=True)
-    last_modified         = models.DateTimeField()
+    expiration = models.DateField(auto_now=False)
+    date_created = models.DateTimeField(auto_now_add=True)
+    last_modified = models.DateTimeField()
     requested_loan_period = models.CharField(max_length=255,blank=True,default='')
-    parent_id             = models.IntegerField(null=True)
+    parent_id = models.IntegerField(null=True,blank=True)
 
 class HiddenReading(models.Model):
-    user    = models.ForeignKey(User)
+    user = models.ForeignKey(User)
     reserve = models.ForeignKey(Reserve)
 
 class IlsRequest(models.Model):
-    date_added            = models.DateField(auto_now_add=True)
+    date_added = models.DateField(auto_now_add=True)
     #whoa, need to do homework on this
-    ils_request_id        = models.CharField(max_length=16,null=True,db_index=True) 
-    ils_control_key       = models.CharField(max_length=16,null=True,db_index=True) 
-    user_net_id           = models.CharField(max_length=16,null=True,db_index=True) 
-    user_ils_id           = models.CharField(max_length=16,null=True,db_index=True) 
-    ils_course            = models.CharField(max_length=150,null=True,db_index=True) 
-    requested_loan_period = models.CharField(max_length=16,null=True) 
+    ils_request_id = models.CharField(max_length=16,db_index=True) 
+    ils_control_key = models.CharField(max_length=16,db_index=True) 
+    user_net_id = models.CharField(max_length=16,db_index=True) 
+    user_ils_id = models.CharField(max_length=16,db_index=True) 
+    ils_course = models.CharField(max_length=150,db_index=True) 
+    requested_loan_period = models.CharField(max_length=16) 
+
+    def __unicode__(self):
+        return self.ils_request_id
 
 class InstLoadPeriod(models.Model):
     loan_period = models.CharField(max_length=255,blank=True,default='')
 
-class InstLoadPeriodLibrary(models.Model):
-    library     = models.ForeignKey(Library)
+    def __unicode__(self):
+        return self.loan_period
+
+class InstLoadPeriodLibraryUnit(models.Model):
+    library = models.ForeignKey(LibraryUnit)
     loan_period = models.ForeignKey(InstLoadPeriod)
-    default     = models.BooleanField(default=False)
+    default= models.BooleanField(default=False)
 
-class InstructorAttributes(models.Model):
-    user                  = models.ForeignKey(User)
-    ils_user_id           = models.CharField(max_length=50,null=True) 
-    ils_name              = models.CharField(max_length=75,null=True) 
-    organizational_status = models.CharField(max_length=25,null=True) 
-   
+class InstructorAttribute(models.Model):
+    user = models.ForeignKey(User)
+    ils_user_id = models.CharField(max_length=50) 
+    ils_name = models.CharField(max_length=75) 
+    organizational_status = models.CharField(max_length=25) 
 
 class ItemUploadLog(models.Model):
-    user               = models.ForeignKey(User)
-    course_instance    = models.ForeignKey(CourseInstance)
-    item               = models.ForeignKey(Item)
+    user = models.ForeignKey(User)
+    course_instance = models.ForeignKey(CourseInstance)
+    item = models.ForeignKey(Item)
     timestamp_uploaded = models.DateTimeField()
-    filesize           = models.CharField(max_length=10,blank=True,default='')
-    ipaddr             = models.IPAddressField()
+    filesize = models.CharField(max_length=10,blank=True,default='')
+    ipaddr = models.IPAddressField()
 
-class News(models.Model):
-    news_text                 = models.TextField()
-    font_class                = models.CharField(max_length=50,blank=True,default='')
+class NewsItem(models.Model):
+    news_text = models.TextField()
+    font_class = models.CharField(max_length=50,blank=True,default='')
     PERMISSIONS_LEVEL_CHOICES = (
         ('0', '0 - '),
         ('1', '1 - '),
@@ -220,153 +252,182 @@ class News(models.Model):
         ('4', '4 - '),
         ('5', '5 - ')
     )
-    permissions_level         = models.CharField(max_length=1, 
-        choices               = PERMISSIONS_LEVEL_CHOICES,
-        blank                 = True,
-        default               = ''
+    permissions_level = models.CharField(max_length=1, 
+        choices=PERMISSIONS_LEVEL_CHOICES,
+        blank=True,
+        default=''
     )
 
+    def __unicode__(self):
+        return self.news_text
+
 class NotTrained(models.Model):
-    user             = models.ForeignKey(User)
+    user = models.ForeignKey(User)
     permission_level = models.IntegerField(default=0)
 
 class Note(models.Model):
-    type      = models.CharField(max_length=25,blank=True,default='')
+    type = models.CharField(max_length=25,blank=True,default='')
     target_id = models.IntegerField(default=0)
-    note      = models.TextField() 
-    target    = models.CharField(max_length=50,blank=True,default='')
+    note = models.TextField() 
+    target = models.CharField(max_length=50,blank=True,default='')
 
+    def __unicode__(self):
+        return self.note
     
-class PhysicalCopy(models.Model):
-    reserve        = models.ForeignKey(Reserve)
-    item           = models.ForeignKey(Item)
-    status         = models.CharField(max_length=30,blank=True,default='')
-    call_number    = models.TextField() 
+class PhysicalCopyItem(models.Model):
+    reserve = models.ForeignKey(Reserve)
+    item = models.ForeignKey(Item)
+    status = models.CharField(max_length=30,blank=True,default='')
+    call_number = models.TextField() 
     owning_library = models.CharField(max_length=15,default='0')
-    item_type      = models.CharField(max_length=30,null=True) 
-    owner_user_id  = models.IntegerField(null=True)
+    item_type = models.CharField(max_length=30) 
+    owner_user_id = models.IntegerField(null=True,blank=True)
 
-class Proxy(models.Model):
-    name   = models.CharField(max_length=50,blank=True,default='')
+class ProxyIdent(models.Model):
+    name = models.CharField(max_length=50,blank=True,default='')
     prefix = models.CharField(max_length=255,blank=True,default='')
 
+    def __unicode__(self):
+        return self.name
+
 class ProxiedHost(models.Model):
-    proxy         = models.ForeignKey(Proxy)
-    domain        = models.CharField(max_length=255,blank=True,default='')
+    proxy = models.ForeignKey(ProxyIdent)
+    domain = models.CharField(max_length=255,blank=True,default='')
     partial_match = models.BooleanField(default=False)
 
 class Request(models.Model):
-    reserve         = models.ForeignKey(Reserve)
-    item            = models.ForeignKey(Item)
-    user            = models.ForeignKey(User)
-    date_requested  = models.DateField()
-    date_processed  = models.DateField(auto_now=False)
-    date_desired    = models.DateField(auto_now=False)
-    priority        = models.IntegerField(null=True)
+    reserve = models.ForeignKey(Reserve)
+    item = models.ForeignKey(Item)
+    user = models.ForeignKey(User)
+    date_requested = models.DateField()
+    date_processed = models.DateField(auto_now=False)
+    date_desired = models.DateField(auto_now=False)
+    priority = models.IntegerField(null=True,blank=True)
     course_instance = models.ForeignKey(CourseInstance)
 
 class Report(models.Model):
-    title                = models.CharField(max_length=255)
-    PARAM_GROUP_CHOICES  = (
+    title = models.CharField(max_length=255)
+    PARAM_GROUP_CHOICES = (
         ('TERM', 'Term'),
         ('DEPARTMENT', 'Department'),
         ('CLASS', 'Class'),
         ('TERM_LIB', 'Term Lib'),
         ('TERM_DATES', 'Term Dates')
     )
-    param_group          = models.CharField(max_length=10, 
-        blank            = True,
-        choices          = PARAM_GROUP_CHOICES, 
-        default          = ''
+    param_group = models.CharField(max_length=10, 
+        blank=True,
+        choices=PARAM_GROUP_CHOICES, 
+        default=''
     )
-    sql                  = models.TextField() 
-    parameters           = models.CharField(max_length=255,null=True) 
-    min_permissions      = models.IntegerField(default=4)
-    sort_order           = models.IntegerField(default=0)
-    cached               = models.BooleanField(default=True)
+    sql = models.TextField() 
+    parameters = models.CharField(max_length=255) 
+    min_permissions = models.IntegerField(default=4)
+    sort_order = models.IntegerField(default=0)
+    cached = models.BooleanField(default=True)
     cached_refresh_delay = models.IntegerField(default=6)
 
+    def __unicode__(self):
+        return self.title
+
 class ReportCache(models.Model):
-    report        = models.ForeignKey(Report)
-    params_cache  = models.TextField() 
+    report = models.ForeignKey(Report)
+    params_cache = models.TextField() 
     reports_cache = models.TextField() 
     last_modified = models.DateTimeField() 
 
 class Skin(models.Model):
-    skin_name        = models.CharField(max_length=25,blank=True,default='')
-    skin_stylesheet  = models.TextField() 
+    skin_name = models.CharField(max_length=25,blank=True,default='')
+    skin_stylesheet = models.TextField() 
     default_selected = models.BooleanField(default=False)
 
+    def __unicode__(self):
+        return self.skin_name
+
 class SpecialUser(models.Model):
-    user       = models.ForeignKey(User)
-    password   = models.CharField(max_length=75,blank=True,default='')
-    expiration = models.DateField(null=True)
+    user = models.ForeignKey(User)
+    password = models.CharField(max_length=75,blank=True,default='')
+    expiration = models.DateField(null=True,blank=True)
 
 class SpecialUserAudit(models.Model):
-    user          = models.ForeignKey(User)
-    creator       = models.ForeignKey(User,related_name='creator')
-    date_created  = models.DateTimeField(auto_now_add=True)
-    email_sent_to = models.CharField(max_length=255,null=True)
-
-class StaffLibrary(models.Model):
-    user             = models.ForeignKey(User)
-    library          = models.ForeignKey(Library)
+    user = models.ForeignKey(User)
+    creator = models.ForeignKey(User,related_name='creator')
+    date_created = models.DateTimeField(auto_now_add=True)
+    email_sent_to = models.CharField(max_length=255)
+
+class StaffLibraryUnit(models.Model):
+    user = models.ForeignKey(User)
+    library = models.ForeignKey(LibraryUnit)
     permission_level = models.IntegerField(default=0)
 
 class Term(models.Model):
     sort_order = models.IntegerField(default=0)
-    term_name  = models.CharField(max_length=100,default='')
-    term_year  = models.CharField(max_length=4,default='')
+    term_name = models.CharField(max_length=100,default='')
+    term_year = models.CharField(max_length=4,default='')
     begin_date = models.DateField(auto_now=False)
-    end_date   = models.DateField(auto_now=False)
+    end_date = models.DateField(auto_now=False)
+
+    def __unicode__(self):
+        return self.term_name
 
 class UserViewLog(models.Model):
-    user             = models.ForeignKey(User)
-    reserve          = models.ForeignKey(Reserve)
+    user = models.ForeignKey(User)
+    reserve = models.ForeignKey(Reserve)
     timestamp_viewed = models.DateTimeField()
 
-class MimeTypes(models.Model):
-    mime_type       = models.CharField(max_length=100,default='')
-    helper_app_url  = models.TextField() 
+class MimeType(models.Model):
+    mime_type = models.CharField(max_length=100,default='')
+    helper_app_url = models.TextField() 
     helper_app_name = models.TextField() 
     helper_app_icon = models.TextField() 
     file_extensions = models.CharField(max_length=255,blank=True,default='')
 
-class HelpCategory(models.Model):
-    title       = models.CharField(max_length=100,null=True)
+    def __unicode__(self):
+        return self.mime_type
+
+class HelpCategoryItem(models.Model):
+    title = models.CharField(max_length=100)
     description = models.TextField()
+
+    def __unicode__(self):
+        return self.title
     
 class HelpArticle(models.Model):
-    title         = models.CharField(max_length=100,null=True)
-    date_created  = models.DateField(auto_now_add=True)
-    body          = models.TextField() 
+    title = models.CharField(max_length=100)
+    date_created = models.DateField(auto_now_add=True)
+    body = models.TextField() 
     date_modified = models.DateField()
 
+    def __unicode__(self):
+        return self.title
+
 class HelpArticleTag(models.Model):
     help_article = models.ForeignKey(HelpArticle)
-    user         = models.ForeignKey(User)
-    tag          = models.CharField(max_length=50)
+    user = models.ForeignKey(User)
+    tag = models.CharField(max_length=50)
 
 class HelpCatToRole(models.Model):
     permission_level = models.IntegerField(default=0)
-    can_view         = models.BooleanField(default=False)
-    can_edit         = models.BooleanField(default=False)
+    can_view = models.BooleanField(default=False)
+    can_edit = models.BooleanField(default=False)
+
+    def __unicode__(self):
+        return self.permission_level
 
 class HelpArticleToRole(models.Model):
-    help_article     = models.ForeignKey(HelpArticle)
+    help_article = models.ForeignKey(HelpArticle)
     permission_level = models.IntegerField(default=0)
-    can_view         = models.BooleanField(default=False)
-    can_edit         = models.BooleanField(default=False)
+    can_view = models.BooleanField(default=False)
+    can_edit = models.BooleanField(default=False)
 
 class HelpArticleToArticle(models.Model):
-    help_article1         = models.ForeignKey(HelpArticle,related_name='help_article1')
-    help_article2         = models.ForeignKey(HelpArticle,related_name='help_article2')
+    help_article1 = models.ForeignKey(HelpArticle,related_name='help_article1')
+    help_article2 = models.ForeignKey(HelpArticle,related_name='help_article2')
     RELATION_2TO1_CHOICES = (
         ('CHILD', 'Child'),
         ('SIBLING', 'Sibling')
     )
-    relation_2to1         = models.CharField(max_length=7, 
-        blank             = True,
-        choices           = RELATION_2TO1_CHOICES,
-        default           = ''
+    relation_2to1 = models.CharField(max_length=7, 
+        blank=True,
+        choices=RELATION_2TO1_CHOICES,
+        default=''
     )
diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py
index 1c7590a..d012543 100644
--- a/conifer/syrup/models.py
+++ b/conifer/syrup/models.py
@@ -22,7 +22,6 @@ for k,v in [(k,v) for k,v in AnonymousUserExtensionHack.__dict__.items() \
                 if not k.startswith('_')]:
     setattr(AnonymousUser, k, v)
 
-
 class UserExtensionHack(object):
     def courses(self):
         return Course.objects.filter(member__user=self.id)
@@ -85,7 +84,7 @@ class Member(m.Model):
 
 #------------------------------------------------------------
 
-class News(m.Model):
+class NewsItem(m.Model):
     subject = m.CharField(max_length=200)
     body = m.TextField()
     published = m.DateTimeField(default=datetime.now, blank=True, null=True)
diff --git a/conifer/templates/welcome.xhtml b/conifer/templates/welcome.xhtml
index 2c96436..77e9188 100644
--- a/conifer/templates/welcome.xhtml
+++ b/conifer/templates/welcome.xhtml
@@ -14,7 +14,7 @@ title = 'Welcome!'
     <p><a href="/public/search">Search the Reserves</a></p>
   </div>
   <h1>News</h1>
-  <div py:for="news in models.News.objects.all().order_by('-published')">
+  <div py:for="news in models.NewsItem.objects.all().order_by('-published')">
     <h2>${news.subject}</h2>
     <div>${news.body}</div>
   </div>
-- 
2.11.0