better

1 files changed, 83 insertions, 19 deletions

diff --git a/apps/it/models.py b/apps/it/models.py
index d7922e4..0ebc5d0 100644
--- a/apps/it/models.py
+++ b/apps/it/models.py
@@ -1,24 +1,53 @@
 from django.db import models
+
 from django.contrib.contenttypes import generic
+from django.utils.translation import ugettext as _
+from django.template.defaultfilters import slugify
 from django.contrib.auth.models import User, Group
 from django.contrib.contenttypes.models import ContentType
 
 
-class Attachment(models.Model):
-    attachment = models.FileField(upload_to='attachments')
-    created_by = models.ForeignKey(User)
-    object_id = models.PositiveIntegerField()
-    content_type = models.ForeignKey(ContentType)
+class AbstractGenericItem(models.Model):
+    created_by = models.ForeignKey(User, editable=False)
+    object_id = models.PositiveIntegerField(editable=False)
+    content_type = models.ForeignKey(ContentType, editable=False)
     content_object = generic.GenericForeignKey("content_type", "object_id")
 
-    @classmethod
-    def get_content_type(cls, model):
-        return ContentType.objects.get(app_label='it', model=model)
+    class Meta:
+        abstract = True
+
+
+class TaggedItem(AbstractGenericItem):
+    "A generic tagged item"
+    tag = models.CharField(max_length=128)
+    slug = models.SlugField()
+    color = models.CharField(max_length=8, default="")
+
+    def save(self, *args, **kwargs):
+        self.slug = slugify(self.tag)
+        super(TaggedItem, self).save(*args, **kwargs)
+
+    def __unicode__(self):
+        return self.tag
+
+    class Meta:
+        unique_together = ("content_type", "object_id", "tag",)
+
+
+class Attachment(AbstractGenericItem):
+    attachment = models.FileField(upload_to='attachments')
+
+    def __unicode__(self):
+        import os
+        return os.path.basename(self.attachment.name)
+
+
+class Article(AbstractGenericItem):
+    note = models.TextField()
+    tags = generic.GenericRelation(TaggedItem)
+    title = models.CharField(max_length=256, default='New Article')
+    
 
-    @classmethod
-    def get_files(cls, model):
-        ct = ContentType.objects.get_for_model()
-        return cls.objects.filter(content_type=ct, object_id=model.pk)
 
 class Issue(models.Model):
     description = models.TextField()
@@ -26,9 +55,20 @@ class Issue(models.Model):
     users = models.ManyToManyField(
         User,
         null=True,
-        blank=True,
+        editable=False,
         related_name='metoo'
     )
+    STATES = (
+        ('NEW', _('New')),
+        ('OPEN', _('Open')),
+        ('CLOSED', _('Closed')),
+    )
+    state = models.CharField(max_length=32, choices=STATES, default=STATES[0][0])
+    files = generic.GenericRelation(Attachment)
+    tags = generic.GenericRelation(TaggedItem)
+    created_by = models.ForeignKey(User, editable=False)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
 
     def __unicode__(self):
         return self.description
@@ -36,20 +76,29 @@ class Issue(models.Model):
     def get_absolute_url(self):
         return '/issues/%d/' % self.pk
 
+    class Meta:
+        ordering = ['-priority', 'created_at']
 
 class Task(models.Model):
     description = models.TextField()
-    issue = models.ForeignKey(Issue, null=True)
-    step = models.PositiveIntegerField(default=0)
-    created_by = models.ForeignKey(User, null=True)
-    assigned_to = models.ForeignKey(User, null=True, related_name='tasks')
+    issue = models.ForeignKey(Issue, null=True, editable=False)
+    step = models.PositiveIntegerField(default=0, editable=False)
+    created_by = models.ForeignKey(User, editable=False)
+    assigned_to = models.ForeignKey(User,
+                                    null=True,
+                                    blank=True,
+                                    related_name='tasks')
     created_at = models.DateTimeField(auto_now_add=True)
-    due_date = models.DateField(null=True, blank=True)
-    completed_at = models.DateTimeField(null=True, blank=True)
+    due_date = models.DateField(null=True, blank=True, editable=False)
+    updated_at = models.DateTimeField(auto_now=True)
+    completed_at = models.DateTimeField(null=True, blank=True, editable=False)
+    files = generic.GenericRelation(Attachment)
 
     def __unicode__(self):
         return self.description
 
+    class Meta:
+        ordering = ['-created_at']
 
 class Asset(models.Model):
     name = models.CharField(max_length=256, default='New Asset')
@@ -57,6 +106,21 @@ class Asset(models.Model):
     location = models.CharField(max_length=256)
     ip_address = models.IPAddressField(default='')
     issues = models.ManyToManyField(Issue, null=True)
+    files = generic.GenericRelation(Attachment)
+    KINDS = (
+        ('SERVER', _('Server')),
+        ('WORKSTATION', _('Workstation')),
+        ('NETWORK', _('Networking')),
+        ('SOFTWARE', _('Software')),
+        ('PRINTER', _('Printer')),
+        ('SERVICE', _('Service')),
+    )
+    kind = models.CharField(choices=KINDS, max_length=128, default=KINDS[0][0])
+    tags = generic.GenericRelation(TaggedItem)
+    contact = models.ForeignKey(User, null=True, blank=True)
 
     def __unicode__(self):
         return self.name
+
+    def get_absolute_url(self):
+        return '/stuff/%d/' % self.pk