A catch up commit, as I was getting lazy.

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..7e99e36
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pyc
\ No newline at end of file

diff --git a/notes/__init__.py b/notes/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/notes/admin.py b/notes/admin.py
index 1c197add1cf360d6f4802939545b726237fcd6c8..4c8022eb4ee1169ca8c17495111d0cf5fae9778e 100644 (file)
--- a/notes/admin.py
+++ b/notes/admin.py
@@ -1,5 +1,8 @@
-from notes.models import Note
+from notes.models import Note, Topic
+from django.contrib import admin
 from django.contrib.contenttypes import generic
 
 class NoteInline(generic.GenericTabularInline):
     model = Note
+
+admin.site.register(Topic)

diff --git a/notes/forms.py b/notes/forms.py
new file mode 100644 (file)
index 0000000..f9d0e38
--- /dev/null
+++ b/notes/forms.py
@@ -0,0 +1,8 @@
+from django.forms import ModelForm
+from notes.models import Note
+
+class NoteForm(ModelForm):
+    class Meta:
+        model = Note
+        fields=['content', 'markup', 'topic','date', 'public']
+        

diff --git a/notes/models.py b/notes/models.py
index 35ed32178177b0c12566fe8fb9ca24146f1f32cb..13a653c5b78a056d6eaca3c5a8f7cec9d7ff05ad 100644 (file)
--- a/notes/models.py
+++ b/notes/models.py
@@ -3,6 +3,7 @@ from django.db import models
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
 from django.contrib.auth.models import User
+from django.utils.translation import ugettext_lazy as _
 from myutils.models import MarkupMixin 
 from django_extensions.db.models import TitleSlugDescriptionModel, TimeStampedModel
 
@@ -13,18 +14,25 @@ class Topic(TitleSlugDescriptionModel, TimeStampedModel):
     Topic model class.
     """
 
+    class Meta:
+        verbose_name = _('Topic')
+        verbose_name_plural = _('Topics')
+
+    def __unicode__(self):
+        return self.title
+
 class Note(MarkupMixin, TimeStampedModel):
     """
     Note model class.
 
     A simple model to handle adding arbitrary numbers of notes to an animal profile.
     """
-    topic=models.models.ForeignKey(Topic)
-    date=models.DateField(_('Date'), auto_now=True)
+    topic=models.ForeignKey(Topic)
+    date=models.DateField(_('Date'), default=datetime.now())
     content=models.TextField(_('Content'))
-    rendered_content=models.TextField(_('Rendered content'), blank=True, null=True)
+    rendered_content=models.TextField(_('Rendered content'), blank=True, null=True, editable=False)
     public=models.BooleanField(_('Public'), default=True)
-    author=models.ForeignKey(User)
+    author=models.ForeignKey(User, blank=True, null=True)
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
     content_object = generic.GenericForeignKey("content_type", "object_id")
@@ -38,3 +46,5 @@ class Note(MarkupMixin, TimeStampedModel):
     class MarkupOptions:
         rendered_field = 'rendered_content'
         source_field = 'content'
+        
+