mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-23 00:12:15 +00:00
Made activity stream more useful for form changes
This commit is contained in:
@@ -49,6 +49,12 @@ def model_compare(oldObj, newObj, excluded_keys=[]):
|
|||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
@property
|
||||||
|
def json(self):
|
||||||
|
if "JSON" in self.field.description:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def linebreaks(self):
|
def linebreaks(self):
|
||||||
if isinstance(self.field, TextField):
|
if isinstance(self.field, TextField):
|
||||||
|
|||||||
@@ -14,6 +14,9 @@ from RIGS import versioning
|
|||||||
from django.template import Context,Template
|
from django.template import Context,Template
|
||||||
from django.core.urlresolvers import reverse_lazy
|
from django.core.urlresolvers import reverse_lazy
|
||||||
|
|
||||||
|
class JSONField(models.TextField):
|
||||||
|
description = "String representing a JSON Schema"
|
||||||
|
|
||||||
@reversion.register
|
@reversion.register
|
||||||
class Type(models.Model, RevisionMixin):
|
class Type(models.Model, RevisionMixin):
|
||||||
name = models.CharField(max_length=255, blank=False, null=False)
|
name = models.CharField(max_length=255, blank=False, null=False)
|
||||||
@@ -34,8 +37,8 @@ class Schema(models.Model, RevisionMixin):
|
|||||||
|
|
||||||
start_at = models.DateTimeField()
|
start_at = models.DateTimeField()
|
||||||
|
|
||||||
schema = models.TextField(blank=False, null=False, default="{}")
|
schema = JSONField(blank=False, null=False, default="{}")
|
||||||
layout = models.TextField(blank=False, null=False, default="[]")
|
layout = JSONField(blank=False, null=False, default="[]")
|
||||||
|
|
||||||
comment = models.CharField(max_length=255)
|
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)
|
event = models.ForeignKey('RIGS.Event', related_name='forms', blank=False)
|
||||||
schema = models.ForeignKey('Schema', 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
|
@property
|
||||||
def renderedSchema(self):
|
def renderedSchema(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user