diff options
Diffstat (limited to 'objectapp')
| -rw-r--r-- | objectapp/models.py | 6 | ||||
| -rw-r--r-- | objectapp/templates/objectapp/_gbobject_detail.html | 1 | ||||
| -rw-r--r-- | objectapp/templates/objectapp/skeleton.html | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/objectapp/models.py b/objectapp/models.py index 77643a2b..41d6639d 100644 --- a/objectapp/models.py +++ b/objectapp/models.py @@ -155,7 +155,6 @@ class Gbobject(Node): base. System and Process classes also inherit this class. """ - STATUS_CHOICES = ((DRAFT, _('draft')), (HIDDEN, _('hidden')), (PUBLISHED, _('published'))) @@ -749,8 +748,8 @@ class Gbobject(Node): return textile(self.content) elif MARKUP_LANGUAGE == 'restructuredtext': return restructuredtext(self.content) - elif not '</p>' in self.content: - return linebreaks(self.content) + # elif not '</p>' in self.content: + # return linebreaks(self.content) return self.content @@ -879,6 +878,7 @@ class Process(Gbobject): """ A store processes, events or changes described as changes in attributes and relations """ + processtypes = models.ManyToManyField(Processtype, verbose_name=_('member of process type'), related_name='member_processes', blank=True, null=True) diff --git a/objectapp/templates/objectapp/_gbobject_detail.html b/objectapp/templates/objectapp/_gbobject_detail.html index 2680c8a3..a070716a 100644 --- a/objectapp/templates/objectapp/_gbobject_detail.html +++ b/objectapp/templates/objectapp/_gbobject_detail.html @@ -68,6 +68,7 @@ Content:<nbsp> <input type="button" id="editdata" value="Edit Content"/><ndsp><nbsp> + <input type="button" id="savecontent" value="Save Content"/><ndsp><nbsp> <input type="hidden" id="objectid" value="{{object.id}}"/> <input type="hidden" id="title" value="{{object.title}}"/> diff --git a/objectapp/templates/objectapp/skeleton.html b/objectapp/templates/objectapp/skeleton.html index 4da343e2..2fb9eed0 100644 --- a/objectapp/templates/objectapp/skeleton.html +++ b/objectapp/templates/objectapp/skeleton.html @@ -52,9 +52,9 @@ display: block; position: absolute; } -.orgitdown .orgitdownButton1 a { - background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/org/images/save.jpeg); -} +<!-- .orgitdown .orgitdownButton1 a { --> +<!-- background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/org/images/save.jpeg); --> +<!-- } --> .orgitdown .orgitdownButton2 a { background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/bold.png); } |