diff options
| author | gnowgi <nagarjun@gnowledge.org> | 2012-07-03 04:51:24 -0700 |
|---|---|---|
| committer | gnowgi <nagarjun@gnowledge.org> | 2012-07-03 04:51:24 -0700 |
| commit | 74795e265f87f593508165369ee4180eabc75bfb (patch) | |
| tree | 5278e6bcad99cd4a3ed05968112e171e4e2937df | |
| parent | c79e993f2663f6aeb064a456676dad3b5a35b052 (diff) | |
| parent | ab428bbe537325f537898f1e2240905d492367e1 (diff) | |
| download | gnowsys-74795e265f87f593508165369ee4180eabc75bfb.tar.gz | |
Merge pull request #66 from supriyasawant/master
content field problem has been solved
| -rw-r--r-- | gstudio/admin/objecttype.py | 2 | ||||
| -rw-r--r-- | gstudio/models.py | 2 | ||||
| -rw-r--r-- | objectapp/admin/gbobject.py | 2 | ||||
| -rw-r--r-- | objectapp/models.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/gstudio/admin/objecttype.py b/gstudio/admin/objecttype.py index 8d0eb4e..aa08754 100644 --- a/gstudio/admin/objecttype.py +++ b/gstudio/admin/objecttype.py @@ -35,7 +35,7 @@ class ObjecttypeAdmin(parent_class): form = ObjecttypeAdminForm date_hierarchy = 'creation_date' fieldsets = ((_('Neighbourhood'), {'fields': ('title','altnames','plural','parent','slug', - 'metatypes','tags','image', 'status','content','content_org')}), + 'metatypes','tags','image', 'status','content')}), (_('Dependency'), {'fields': ('prior_nodes', 'posterior_nodes',), 'classes': ('collapse', 'collapse-closed')}), (_('Options'), {'fields': ('featured', 'excerpt', 'template', diff --git a/gstudio/models.py b/gstudio/models.py index 43af11d..690fccc 100644 --- a/gstudio/models.py +++ b/gstudio/models.py @@ -755,7 +755,7 @@ class Nodetype(Node): (PUBLISHED, _('published'))) content = models.TextField(_('content'), null=True, blank=True) - content_org = models.TextField(_('content'), null=True, blank=True) + # content_org = models.TextField(_('content'), null=True, blank=True) parent = models.ForeignKey('self', null=True, blank=True, verbose_name=_('is a kind of'), related_name='children') diff --git a/objectapp/admin/gbobject.py b/objectapp/admin/gbobject.py index 7828662..d828e00 100644 --- a/objectapp/admin/gbobject.py +++ b/objectapp/admin/gbobject.py @@ -59,7 +59,7 @@ class GbobjectAdmin(reversion.VersionAdmin): """Admin for Gbobject model""" form = GbobjectAdminForm date_hierarchy = 'creation_date' - fieldsets = ((_('Content'), {'fields': ('title', 'altnames', 'objecttypes','content','content_org', + fieldsets = ((_('Content'), {'fields': ('title', 'altnames', 'objecttypes','content', 'image', 'status')}), (_('Dependency'), {'fields': ('prior_nodes', 'posterior_nodes',), 'classes': ('collapse', 'collapse-closed')}), diff --git a/objectapp/models.py b/objectapp/models.py index 6849cfa..6c189f8 100644 --- a/objectapp/models.py +++ b/objectapp/models.py @@ -161,7 +161,7 @@ class Gbobject(Node): (PUBLISHED, _('published'))) content = models.TextField(_('content'), null=True, blank=True) - content_org = models.TextField(_('content'), null=True, blank=True) + # content_org = models.TextField(_('content'), null=True, blank=True) image = models.ImageField(_('image'), upload_to=UPLOAD_TO, blank=True, help_text=_('used for illustration')) |