klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-11 12:29:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Begin a PageRevision implementation, but this breaks currently everything!"

Browse Source 
This reverts commit 979fc7bcb7.
This commit is contained in:
Skia
2015-11-30 13:04:46 +01:00
parent 979fc7bcb7
commit 80926dd4ac
4 changed files with 10 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/models.py
View File

@ -151,7 +151,10 @@ class Page(GroupManagedObject, models.Model):
query, but don't rely on it when playing with a Page object, use get_full_name() instead!
"""
name = models.CharField(_('page name'), max_length=30, blank=False)
revision = models.OneToOneField('PageRevision')
# TODO: move title and content to PageRev class with a OneToOne field
title = models.CharField(_("page title"), max_length=255, blank=True)
content = models.TextField(_("page content"), blank=True)
revision = models.PositiveIntegerField(_("current revision"), default=1)
is_locked = models.BooleanField(_("page mutex"), default=False)
parent = models.ForeignKey('self', related_name="children", null=True, blank=True, on_delete=models.SET_NULL)
# Attention: this field may not be valid until you call save(). It's made for fast query, but don't rely on it when
@ -175,10 +178,6 @@ class Page(GroupManagedObject, models.Model):
def __init__(self, *args, **kwargs):
super(Page, self).__init__(*args, **kwargs)
if self.revision is None:
self.revision = PageRevision()
self.revision.save()
def clean(self):
"""
@ -191,8 +190,6 @@ class Page(GroupManagedObject, models.Model):
_('Duplicate page'),
code='duplicate',
)
if self.revision is not None:
self.revision = PageRevision(self.revision)
super(Page, self).clean()
if self.parent is not None and self in self.get_parent_list():
raise ValidationError(
@ -241,9 +238,3 @@ class Page(GroupManagedObject, models.Model):
return self.get_full_name()
class PageRevision(models.Model):
# TODO: move title and content to PageRev class with a OneToOne field
title = models.CharField(_("page title"), max_length=255, blank=True)
content = models.TextField(_("page content"), blank=True)
parent_page = models.ForeignKey(Page, related_name="revisions", null=False, blank=False)