мета данные для стр всех событий мест

apps/place_exposition/urls.py

@@ -45,6 +45,7 @@ urlpatterns = patterns(
     url(
         r'^(?P<slug>.*)/expositions/$',
         PlaceExpositionListView.as_view(),
+        {'meta_id': 94},
         name='place_exposition_list'
     ),
     url(

apps/place_exposition/views.py

@@ -230,18 +230,19 @@ class PlaceCityCatalog(PlaceCatalog):
         return context
 
 
-class PlaceExpositionListView(MetadataMixin, JitterCacheMixin, ListView):
+class PlaceExpositionListView(MetadataMixin, ListView):
     """
     Представление перечня событий относительно места.
     Переход на эту страницу происходит со страницы подробного просмотра
     места, по ссылке "Все события"
     """
     template_name = 'client/place/place_exposition_list.html'
-    cache_range = settings.CACHE_RANGE
+    # cache_range = settings.CACHE_RANGE
 
     def get_object(self):
         slug = self.kwargs.get('slug')
-        return get_object_or_404(PlaceExposition, url=slug)
+        self.object = get_object_or_404(PlaceExposition, url=slug)
+        return self.object
 
     def get_queryset(self):
         return Exposition.objects.filter(

apps/theme/admin.py

@@ -95,9 +95,6 @@ def theme_change(request, theme_id=None):
             data['name_%s'%code] = obj.name
             data['description_%s'%code] = obj.description
             data['main_title_%s'%code] = obj.main_title
-            data['title_%s'%code] = obj.title
-            data['keywords_%s'%code] = obj.keywords
-            data['descriptions_%s'%code] = obj.descriptions
 
 
 

apps/theme/forms.py

@@ -30,13 +30,6 @@ class ThemeForm(forms.Form):
                 self.fields['name_%s' % code] = forms.CharField(label=_(u'Название'), required=required)
                 self.fields['main_title_%s' % code] = forms.CharField(label=_(u'Заголовок'), required=required)
                 self.fields['description_%s' % code] = forms.CharField(label=_(u'Описание'), required=False, widget=CKEditorWidget)#with saving form
-                #meta data
-                self.fields['title_%s' % code] = forms.CharField(label=_(u'Тайтл'), required=False, max_length=255,
-                                                                 widget=forms.TextInput(attrs={'style':'width: 550px'}))
-                self.fields['keywords_%s' % code] = forms.CharField(label=_(u'Description'), required=False, max_length=255,
-                                                                 widget=forms.TextInput(attrs={'style':'width: 550px'}))
-                self.fields['descriptions_%s' % code] = forms.CharField(label=_(u'Keywords'), required=False, max_length=255,
-                                                                 widget=forms.TextInput(attrs={'style':'width: 550px'}))
 
     def save(self, id=None):
         data = self.cleaned_data

apps/theme/migrations/0002_auto__del_field_themetranslation_keywords__del_field_themetranslation_.py

@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'ThemeTranslation.keywords'
+        db.delete_column(u'theme_theme_translation', 'keywords')
+
+        # Deleting field 'ThemeTranslation.title'
+        db.delete_column(u'theme_theme_translation', 'title')
+
+        # Deleting field 'ThemeTranslation.descriptions'
+        db.delete_column(u'theme_theme_translation', 'descriptions')
+
+
+    def backwards(self, orm):
+        # Adding field 'ThemeTranslation.keywords'
+        db.add_column(u'theme_theme_translation', 'keywords',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True),
+                      keep_default=False)
+
+        # Adding field 'ThemeTranslation.title'
+        db.add_column(u'theme_theme_translation', 'title',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True),
+                      keep_default=False)
+
+        # Adding field 'ThemeTranslation.descriptions'
+        db.add_column(u'theme_theme_translation', 'descriptions',
+                      self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True),
+                      keep_default=False)
+
+
+    models = {
+        u'theme.tag': {
+            'Meta': {'unique_together': '()', 'object_name': 'Tag', 'index_together': '()'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'inflect': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'old_url': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}),
+            'theme': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tags'", 'on_delete': 'models.PROTECT', 'to': u"orm['theme.Theme']"}),
+            'url': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'})
+        },
+        u'theme.tagtranslation': {
+            'Meta': {'unique_together': "[('language_code', 'master')]", 'object_name': 'TagTranslation', 'db_table': "u'theme_tag_translation'", 'index_together': '()'},
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'descriptions': ('django.db.models.fields.CharField', [], {'max_length': '250', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '250', 'blank': 'True'}),
+            'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+            'main_title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'null': 'True', 'to': u"orm['theme.Tag']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '250', 'blank': 'True'})
+        },
+        u'theme.theme': {
+            'Meta': {'unique_together': '()', 'object_name': 'Theme', 'index_together': '()'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'inflect': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'main_page_conf': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'}),
+            'main_page_expo': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'}),
+            'old_url': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}),
+            'types': ('django.db.models.fields.BigIntegerField', [], {'default': 'None'}),
+            'url': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'})
+        },
+        u'theme.themetranslation': {
+            'Meta': {'unique_together': "[('language_code', 'master')]", 'object_name': 'ThemeTranslation', 'db_table': "u'theme_theme_translation'", 'index_together': '()'},
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+            'main_title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'null': 'True', 'to': u"orm['theme.Theme']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['theme']

apps/theme/models.py

@@ -47,11 +47,7 @@ class Theme(TranslatableModel):
     translations = TranslatedFields(
         name = models.CharField(max_length=255),
         main_title = models.CharField(max_length=255),
-        description = models.TextField(blank=True),
-        #-----meta data
-        title = models.CharField(max_length=255, blank=True),
-        descriptions = models.CharField(max_length=255, blank=True),
-        keywords = models.CharField(max_length=255, blank=True),
+        description = models.TextField(blank=True)
     )
 
     main_page_conf = models.PositiveIntegerField(default=0, db_index=True)

templates/c_admin/theme/theme_add.html

@@ -42,18 +42,6 @@
             {% with field='description' form=form languages=languages %}
                 {% include 'c_admin/forms/multilang.html' %}
             {% endwith %}
-            {# keywords #}
-            {% with field='keywords' form=form languages=languages %}
-                {% include 'c_admin/forms/multilang.html' %}
-            {% endwith %}
-            {# title #}
-            {% with field='title' form=form languages=languages %}
-                {% include 'c_admin/forms/multilang.html' %}
-            {% endwith %}
-            {# descriptions #}
-            {% with field='descriptions' form=form languages=languages %}
-                {% include 'c_admin/forms/multilang.html' %}
-            {% endwith %}
         </div>
      </div>