From fd6fbbb1bee2882e537ccecee0dbb5b19abbdaa9 Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Thu, 2 Feb 2017 17:25:24 +0200 Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=B0=20=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D1=81=D1=82=D1=80=20?= =?UTF-8?q?=D0=B2=D1=81=D0=B5=D1=85=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=BC=D0=B5=D1=81=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/place_exposition/urls.py | 1 + apps/place_exposition/views.py | 7 +- apps/theme/admin.py | 3 - apps/theme/forms.py | 7 -- ...n_keywords__del_field_themetranslation_.py | 80 +++++++++++++++++++ apps/theme/models.py | 6 +- templates/c_admin/theme/theme_add.html | 12 --- 7 files changed, 86 insertions(+), 30 deletions(-) create mode 100644 apps/theme/migrations/0002_auto__del_field_themetranslation_keywords__del_field_themetranslation_.py diff --git a/apps/place_exposition/urls.py b/apps/place_exposition/urls.py index 5ee78d27..e3fe1120 100644 --- a/apps/place_exposition/urls.py +++ b/apps/place_exposition/urls.py @@ -45,6 +45,7 @@ urlpatterns = patterns( url( r'^(?P.*)/expositions/$', PlaceExpositionListView.as_view(), + {'meta_id': 94}, name='place_exposition_list' ), url( diff --git a/apps/place_exposition/views.py b/apps/place_exposition/views.py index fae2ac85..d438c3c3 100644 --- a/apps/place_exposition/views.py +++ b/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( diff --git a/apps/theme/admin.py b/apps/theme/admin.py index f8c4b1f1..68ab8378 100644 --- a/apps/theme/admin.py +++ b/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 diff --git a/apps/theme/forms.py b/apps/theme/forms.py index c71820ff..9026c466 100644 --- a/apps/theme/forms.py +++ b/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 diff --git a/apps/theme/migrations/0002_auto__del_field_themetranslation_keywords__del_field_themetranslation_.py b/apps/theme/migrations/0002_auto__del_field_themetranslation_keywords__del_field_themetranslation_.py new file mode 100644 index 00000000..231b3205 --- /dev/null +++ b/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'] \ No newline at end of file diff --git a/apps/theme/models.py b/apps/theme/models.py index c5c2736e..3fc7725d 100644 --- a/apps/theme/models.py +++ b/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) diff --git a/templates/c_admin/theme/theme_add.html b/templates/c_admin/theme/theme_add.html index 73496583..cabcbcea 100644 --- a/templates/c_admin/theme/theme_add.html +++ b/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 %}