remove multilingual dependency, fix broken no has_list tabs
This commit is contained in:
parent
a25e20da6c
commit
c885d2911b
|
@ -40,13 +40,17 @@ class ModuleTab(models.Model):
|
||||||
return self.model_class().get_list(options)
|
return self.model_class().get_list(options)
|
||||||
|
|
||||||
def get_dict(self):
|
def get_dict(self):
|
||||||
|
if self.model.has_list:
|
||||||
|
page = self.get_list({})
|
||||||
|
else:
|
||||||
|
page = None
|
||||||
return {
|
return {
|
||||||
'id': self.id,
|
'id': self.id,
|
||||||
'slug': self.slug,
|
'slug': self.slug,
|
||||||
'title': self.title,
|
'title': self.title,
|
||||||
'text': self.text,
|
'text': self.text,
|
||||||
'has_list': self.model.has_list,
|
'has_list': self.model.has_list,
|
||||||
# 'page': self.get_list({}),
|
'page': self.get_list({}),
|
||||||
'sorts': [s.get_dict() for s in self.model.modelsort_set.all()]
|
'sorts': [s.get_dict() for s in self.model.modelsort_set.all()]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -159,7 +159,7 @@ INSTALLED_APPS = (
|
||||||
# 'boxes',
|
# 'boxes',
|
||||||
'frontpage',
|
'frontpage',
|
||||||
# 'solango',
|
# 'solango',
|
||||||
'multilingual',
|
# 'multilingual',
|
||||||
# 'multilingual.flatpages',
|
# 'multilingual.flatpages',
|
||||||
'django_extensions',
|
'django_extensions',
|
||||||
'debug_toolbar',
|
'debug_toolbar',
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
-e svn+http://code.djangoproject.com/svn/django/branches/releases/1.2.X/#egg=django
|
-e svn+http://code.djangoproject.com/svn/django/branches/releases/1.2.X/#egg=django
|
||||||
-e bzr+http://code.0x2620.org/python-ox/#egg=python-ox
|
-e bzr+http://code.0x2620.org/python-ox/#egg=python-ox
|
||||||
-e svn+http://django-multilingual.googlecode.com/svn/trunk/#egg=multilingual
|
#-e svn+http://django-multilingual.googlecode.com/svn/trunk/#egg=multilingual
|
||||||
-e bzr+http://firefogg.org/dev/python-firefogg/#egg=python-firefogg
|
-e bzr+http://firefogg.org/dev/python-firefogg/#egg=python-firefogg
|
||||||
-e bzr+http://firefogg.org/dev/django_firefogg/#egg=django_firefogg
|
-e bzr+http://firefogg.org/dev/django_firefogg/#egg=django_firefogg
|
||||||
-e hg+https://django-ajax-filtered-fields.googlecode.com/hg/#egg=django-ajax-filtered-fields
|
-e hg+https://django-ajax-filtered-fields.googlecode.com/hg/#egg=django-ajax-filtered-fields
|
||||||
|
|
Loading…
Reference in New Issue
Block a user