From c885d2911b59566f7cce62f000e0072ca14612a6 Mon Sep 17 00:00:00 2001 From: j Date: Tue, 11 Oct 2011 17:14:55 +0530 Subject: [PATCH] remove multilingual dependency, fix broken no has_list tabs --- itf/insidepages/models.py | 6 +++++- itf/settings.py | 2 +- requirements.txt | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/itf/insidepages/models.py b/itf/insidepages/models.py index 1d90a2d..9fa94a8 100755 --- a/itf/insidepages/models.py +++ b/itf/insidepages/models.py @@ -40,13 +40,17 @@ class ModuleTab(models.Model): return self.model_class().get_list(options) def get_dict(self): + if self.model.has_list: + page = self.get_list({}) + else: + page = None return { 'id': self.id, 'slug': self.slug, 'title': self.title, 'text': self.text, '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()] } diff --git a/itf/settings.py b/itf/settings.py index 59ac1aa..f6fa048 100755 --- a/itf/settings.py +++ b/itf/settings.py @@ -159,7 +159,7 @@ INSTALLED_APPS = ( # 'boxes', 'frontpage', # 'solango', - 'multilingual', +# 'multilingual', # 'multilingual.flatpages', 'django_extensions', 'debug_toolbar', diff --git a/requirements.txt b/requirements.txt index 5a5a21b..6a24189 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -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 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/django_firefogg/#egg=django_firefogg -e hg+https://django-ajax-filtered-fields.googlecode.com/hg/#egg=django-ajax-filtered-fields