arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Made activity stream more useful for form changes

Browse Source
This commit is contained in:
David Taylor
2015-08-14 17:16:38 +03:00
committed by Tom Price
parent b3c6e4ce73
commit ece075e948
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RIGS/versioning.py
View File

@@ -49,6 +49,12 @@ def model_compare(oldObj, newObj, excluded_keys=[]):
return True
return False
@property
def json(self):
if "JSON" in self.field.description:
return True
return False
@property
def linebreaks(self):
if isinstance(self.field, TextField):

9
rigForms/models.py
View File

@@ -14,6 +14,9 @@ from RIGS import versioning
from django.template import Context,Template
from django.core.urlresolvers import reverse_lazy
class JSONField(models.TextField):
description = "String representing a JSON Schema"
@reversion.register
class Type(models.Model, RevisionMixin):
name = models.CharField(max_length=255, blank=False, null=False)
@@ -34,8 +37,8 @@ class Schema(models.Model, RevisionMixin):
start_at = models.DateTimeField()
schema = models.TextField(blank=False, null=False, default="{}")
layout = models.TextField(blank=False, null=False, default="[]")
schema = JSONField(blank=False, null=False, default="{}")
layout = JSONField(blank=False, null=False, default="[]")
comment = models.CharField(max_length=255)
@@ -76,7 +79,7 @@ class Form(models.Model, RevisionMixin):
event = models.ForeignKey('RIGS.Event', related_name='forms', blank=False)
schema = models.ForeignKey('Schema', related_name='forms', blank=False)
data = models.TextField(blank=False, null=False, default="{}")
data = JSONField(blank=False, null=False, default="{}")
@property
def renderedSchema(self):