Merge pull request #32 from dpad/master

Re-introduced tinymce to Static.
UNSW-CSESoc · Jan 17, 2012 · 91e198e · 91e198e
2 parents 28ec73b + af392d6
commit 91e198e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/csesoc/mainsite/models.py b/csesoc/mainsite/models.py
@@ -12,9 +12,8 @@
 
 class Static(models.Model):
    title = models.CharField(max_length=200)
-   text = models.TextField()
-   # HTML mode is broken for tinymce
-   #text = tinymce_models.HTMLField()
+   #text = models.TextField()
+   text = tinymce_models.HTMLField()
    template = models.FilePathField(path=os.path.join(settings.PROJECT_PATH, "templates"), match="static.*\.html")
    creation_date = models.DateTimeField(auto_now_add=True)
    creator = models.ForeignKey(User, related_name='page_creator')