From d4b89ca71ac93a7bc2346b5a2eb3ab6ae75eb355 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Fri, 29 Apr 2016 09:43:34 +0300 Subject: [PATCH] 1more --- .../0002_auto__add_field_top_months.py | 502 ------------------ expobanner/models.py | 5 +- functions/custom_fields.py | 12 +- 3 files changed, 9 insertions(+), 510 deletions(-) delete mode 100644 expobanner/migrations/0002_auto__add_field_top_months.py diff --git a/expobanner/migrations/0002_auto__add_field_top_months.py b/expobanner/migrations/0002_auto__add_field_top_months.py deleted file mode 100644 index 25d8366f..00000000 --- a/expobanner/migrations/0002_auto__add_field_top_months.py +++ /dev/null @@ -1,502 +0,0 @@ -# -*- 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): - # Adding field 'Top.months' - db.add_column(u'expobanner_top', 'months', - self.gf('multiselectfield.db.fields.MultiSelectField')(default=None, max_length=255, null=True, blank=True), - keep_default=False) - - # Adding M2M table for field cities on 'Top' - m2m_table_name = db.shorten_name(u'expobanner_top_cities') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('top', models.ForeignKey(orm[u'expobanner.top'], null=False)), - ('city', models.ForeignKey(orm[u'city.city'], null=False)) - )) - db.create_unique(m2m_table_name, ['top_id', 'city_id']) - - - def backwards(self, orm): - # Deleting field 'Top.months' - db.delete_column(u'expobanner_top', 'months') - - # Removing M2M table for field cities on 'Top' - db.delete_table(db.shorten_name(u'expobanner_top_cities')) - - - models = { - u'accounts.user': { - 'Meta': {'ordering': "['-rating']", 'object_name': 'User'}, - 'blocked': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'company': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'users'", 'null': 'True', 'to': u"orm['company.Company']"}), - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'date_registered': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'db_index': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_admin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'organiser': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['organiser.Organiser']", 'unique': 'True', 'null': 'True', 'on_delete': 'models.PROTECT', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'position': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'rating': ('django.db.models.fields.IntegerField', [], {'default': '100'}), - 'translator': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user'", 'null': 'True', 'on_delete': 'models.PROTECT', 'to': u"orm['translator.Translator']", 'blank': 'True', 'unique': 'True'}), - 'url': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'blank': 'True'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}) - }, - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'city.city': { - 'Meta': {'unique_together': '()', 'object_name': 'City', 'index_together': '()'}, - 'code_IATA': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['directories.Iata']", 'null': 'True', 'blank': 'True'}), - 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'cities'", 'null': 'True', 'on_delete': 'models.PROTECT', 'to': u"orm['country.Country']"}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'inflect': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'blank': 'True'}), - 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'old_url': ('django.db.models.fields.CharField', [], {'max_length': '55'}), - 'phone_code': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'population': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'services': ('django.db.models.fields.BigIntegerField', [], {'default': 'None'}), - 'url': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) - }, - u'company.company': { - 'Meta': {'ordering': "['-rating', 'id']", 'unique_together': '()', 'object_name': 'Company', 'index_together': '()'}, - 'address': ('functions.custom_fields.LocationField', [], {'blank': 'True'}), - 'blocked': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'city': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'companies'", 'null': 'True', 'on_delete': 'models.PROTECT', 'to': u"orm['city.City']"}), - 'country': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'companies'", 'null': 'True', 'on_delete': 'models.PROTECT', 'to': u"orm['country.Country']"}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'created_company'", 'null': 'True', 'to': u"orm['accounts.User']"}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'facebook': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'fax': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'foundation': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'linkedin': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}), - 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'phone': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'rating': ('django.db.models.fields.IntegerField', [], {'default': '100'}), - 'staff_number': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'companies'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['theme.Tag']"}), - 'theme': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'companies'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['theme.Theme']"}), - 'twitter': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'url': ('django.db.models.fields.SlugField', [], {'max_length': '255'}), - 'vk': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'web_page': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) - }, - u'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - u'country.area': { - 'Meta': {'ordering': "['translations__name']", 'unique_together': '()', 'object_name': 'Area', 'index_together': '()'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'country.country': { - 'Meta': {'ordering': "['translations__name']", 'unique_together': '()', 'object_name': 'Country', 'index_together': '()'}, - 'area': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['country.Area']"}), - 'big_cities': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'cities'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['city.City']"}), - 'capital': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'capital'", 'null': 'True', 'on_delete': 'models.PROTECT', 'to': u"orm['city.City']"}), - 'country_code': ('django.db.models.fields.CharField', [], {'max_length': '2'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'currency': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['directories.Currency']", 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'inflect': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'language': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['directories.Language']", 'null': 'True', 'blank': 'True'}), - 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), - 'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'blank': 'True'}), - 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), - 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'old_url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '55'}), - 'phone_code': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'population': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'services': ('django.db.models.fields.BigIntegerField', [], {'default': 'None'}), - 'teritory': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'time_delivery': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'timezone': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) - }, - u'directories.currency': { - 'Meta': {'unique_together': '()', 'object_name': 'Currency', 'index_together': '()'}, - 'code': ('django.db.models.fields.CharField', [], {'max_length': '3'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'directories.iata': { - 'Meta': {'object_name': 'Iata'}, - 'airport': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'code': ('django.db.models.fields.CharField', [], {'max_length': '4'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'directories.language': { - 'Meta': {'unique_together': '()', 'object_name': 'Language', 'index_together': '()'}, - 'code': ('django.db.models.fields.CharField', [], {'max_length': '2'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'language': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - u'expobanner.banner': { - 'Meta': {'ordering': "['sort']", 'object_name': 'Banner'}, - 'alt': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'cookie': ('django.db.models.fields.CharField', [], {'default': "'expo_b_default_popup'", 'max_length': '30', 'null': 'True', 'blank': 'True'}), - 'country': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['country.Country']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'flash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'fr': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2016, 4, 29, 0, 0)'}), - 'group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'banners'", 'null': 'True', 'to': u"orm['expobanner.BannerGroup']"}), - 'html': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'img': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), - 'link': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'often': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), - 'paid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'popup': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'sort': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '500'}), - 'stat_pswd': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'text': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'theme': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['theme.Theme']", 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'to': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), - 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'urls': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'url_banners'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['expobanner.URL']"}) - }, - u'expobanner.bannergroup': { - 'Meta': {'ordering': "['name']", 'object_name': 'BannerGroup'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'height': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'speed': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '2000'}), - 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}) - }, - u'expobanner.log': { - 'Meta': {'object_name': 'Log'}, - 'banner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'banner_logs'", 'to': u"orm['expobanner.Banner']"}), - 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'group_logs'", 'null': 'True', 'to': u"orm['expobanner.BannerGroup']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}), - 'key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), - 'page': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), - 'type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0', 'max_length': '1'}), - 'urls': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'url_logs'", 'blank': 'True', 'to': u"orm['expobanner.URL']"}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'users'", 'null': 'True', 'to': u"orm['accounts.User']"}), - 'user_agent': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}) - }, - u'expobanner.logstat': { - 'Meta': {'ordering': "['-date']", 'object_name': 'LogStat'}, - 'banner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'banner_stat'", 'blank': 'True', 'to': u"orm['expobanner.Banner']"}), - 'click': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'date': ('django.db.models.fields.DateField', [], {}), - 'group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'group_stat'", 'null': 'True', 'to': u"orm['expobanner.BannerGroup']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'unique_click': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'unique_view': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'urls': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'url_bloks'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['expobanner.URL']"}), - 'view': ('django.db.models.fields.PositiveIntegerField', [], {}) - }, - u'expobanner.mainpage': { - 'Meta': {'ordering': "['-public']", 'object_name': 'MainPage'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'link': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['expobanner.Banner']"}), - 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'position': ('django.db.models.fields.PositiveIntegerField', [], {'default': '2', 'null': 'True', 'blank': 'True'}), - 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'stat_pswd': ('django.db.models.fields.CharField', [], {'max_length': '16'}) - }, - u'expobanner.paid': { - 'Meta': {'ordering': "['-public']", 'object_name': 'Paid'}, - 'catalog': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'paid_catalog'", 'to': u"orm['expobanner.Banner']"}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}), - 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'official': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'paid_official'", 'to': u"orm['expobanner.Banner']"}), - 'organiser': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), - 'participation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'paid_participation'", 'to': u"orm['expobanner.Banner']"}), - 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'stat_pswd': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'tickets': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'paid_tickets'", 'to': u"orm['expobanner.Banner']"}) - }, - u'expobanner.paidstat': { - 'Meta': {'ordering': "['-date']", 'object_name': 'PaidStat'}, - 'catalog_clicks': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'catalog_views': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'date': ('django.db.models.fields.DateField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'official_clicks': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'page_views': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'paid': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['expobanner.Paid']"}), - 'participation_clicks': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'price_views': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'tickets_clicks': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) - }, - u'expobanner.top': { - 'Meta': {'ordering': "['position']", 'object_name': 'Top'}, - 'catalog': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'cities': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'top_in_set'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['city.City']"}), - 'country': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['country.Country']", 'null': 'True', 'blank': 'True'}), - 'excluded_cities': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['city.City']", 'null': 'True', 'blank': 'True'}), - 'excluded_tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['theme.Tag']", 'null': 'True', 'blank': 'True'}), - 'fr': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2016, 4, 29, 0, 0)'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'link': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['expobanner.Banner']"}), - 'months': ('multiselectfield.db.fields.MultiSelectField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'position': ('django.db.models.fields.PositiveIntegerField', [], {'default': '2', 'null': 'True', 'blank': 'True'}), - 'stat_pswd': ('django.db.models.fields.CharField', [], {'max_length': '16'}), - 'theme': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['theme.Theme']", 'null': 'True', 'blank': 'True'}), - 'to': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}) - }, - u'expobanner.topstat': { - 'Meta': {'object_name': 'TopStat'}, - 'city': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['city.City']", 'null': 'True', 'blank': 'True'}), - 'clicks': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['country.Country']", 'null': 'True', 'blank': 'True'}), - 'date': ('django.db.models.fields.DateField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['theme.Tag']", 'null': 'True', 'blank': 'True'}), - 'theme': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['theme.Theme']", 'null': 'True', 'blank': 'True'}), - 'views': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) - }, - u'expobanner.url': { - 'Meta': {'ordering': "['-created_at']", 'object_name': 'URL'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'regex': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'sites': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'site_urls'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['sites.Site']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.CharField', [], {'max_length': '2048'}) - }, - u'file.filemodel': { - 'Meta': {'unique_together': '()', 'object_name': 'FileModel', 'index_together': '()'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']", 'null': 'True'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'file_path': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'file_type': ('functions.custom_fields.EnumField', [], {'default': "'PDF'", 'values': "('PDF', 'DOC', 'TXT', 'OTHER', 'JPG', 'BMP', 'PNG', 'GIF')", 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'img_height': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'img_width': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'purpose': ('functions.custom_fields.EnumField', [], {'default': "'photo'", 'values': "['photo', 'flat', 'logo', 'map', 'scheme teritory', 'diplom', 'preview', 'preview2']"}) - }, - u'organiser.organiser': { - 'Meta': {'unique_together': '()', 'object_name': 'Organiser', 'index_together': '()'}, - 'active': ('django.db.models.fields.NullBooleanField', [], {'default': '0', 'null': 'True', 'blank': 'True'}), - 'address': ('functions.custom_fields.LocationField', [], {'null': 'True', 'blank': 'True'}), - 'city': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['city.City']", 'null': 'True', 'on_delete': 'models.PROTECT', 'blank': 'True'}), - 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['country.Country']", 'null': 'True', 'on_delete': 'models.PROTECT', 'blank': 'True'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'events_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'facebook': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'fax': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'foundation': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'linkedin': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'}), - 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'phone': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'place_conference': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'organiser_place_conference'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['place_conference.PlaceConference']"}), - 'place_exposition': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'organiser_place_exposition'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['place_exposition.PlaceExposition']"}), - 'rating': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'staff_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['theme.Tag']", 'null': 'True', 'blank': 'True'}), - 'theme': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['theme.Theme']", 'null': 'True', 'blank': 'True'}), - 'twitter': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'url': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'blank': 'True'}), - 'vk': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'web_page': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) - }, - u'photologue.gallery': { - 'Meta': {'ordering': "['-date_added']", 'unique_together': '()', 'object_name': 'Gallery', 'index_together': '()'}, - 'date_added': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'photos': ('sortedm2m.fields.SortedManyToManyField', [], {'blank': 'True', 'related_name': "'galleries'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['photologue.Photo']"}), - 'sites': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['sites.Site']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '200'}), - 'tags': ('photologue.models.TagField', [], {'max_length': '255', 'blank': 'True'}) - }, - u'photologue.photo': { - 'Meta': {'ordering': "['sort']", 'unique_together': '()', 'object_name': 'Photo', 'index_together': '()'}, - 'crop_from': ('django.db.models.fields.CharField', [], {'default': "'center'", 'max_length': '10', 'blank': 'True'}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'date_taken': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'effect': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'photo_related'", 'null': 'True', 'to': u"orm['photologue.PhotoEffect']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'sites': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['sites.Site']", 'null': 'True', 'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '200'}), - 'sort': ('django.db.models.fields.PositiveIntegerField', [], {'default': '10', 'null': 'True', 'db_index': 'True'}), - 'tags': ('photologue.models.TagField', [], {'max_length': '255', 'blank': 'True'}), - 'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['photologue.UserMark']", 'null': 'True', 'symmetrical': 'False'}), - 'view_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}) - }, - u'photologue.photoeffect': { - 'Meta': {'object_name': 'PhotoEffect'}, - 'background_color': ('django.db.models.fields.CharField', [], {'default': "'#FFFFFF'", 'max_length': '7'}), - 'brightness': ('django.db.models.fields.FloatField', [], {'default': '1.0'}), - 'color': ('django.db.models.fields.FloatField', [], {'default': '1.0'}), - 'contrast': ('django.db.models.fields.FloatField', [], {'default': '1.0'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'filters': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), - 'reflection_size': ('django.db.models.fields.FloatField', [], {'default': '0'}), - 'reflection_strength': ('django.db.models.fields.FloatField', [], {'default': '0.6'}), - 'sharpness': ('django.db.models.fields.FloatField', [], {'default': '1.0'}), - 'transpose_method': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}) - }, - u'photologue.usermark': { - 'Meta': {'object_name': 'UserMark'}, - 'height': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'left': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), - 'top': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'marks'", 'to': u"orm['accounts.User']"}), - 'width': ('django.db.models.fields.PositiveSmallIntegerField', [], {}) - }, - u'place_conference.placeconference': { - 'Meta': {'unique_together': '()', 'object_name': 'PlaceConference', 'index_together': '()'}, - 'address': ('functions.custom_fields.LocationField', [], {}), - 'amount_halls': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'banquet_hall': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'catering': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'city': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'place_conferences'", 'on_delete': 'models.PROTECT', 'to': u"orm['city.City']"}), - 'conference_call': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['country.Country']", 'on_delete': 'models.PROTECT'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'exp_hall_area': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'exposition_hall': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'fax': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'foundation_year': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'hotel': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'blank': 'True'}), - 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'multimedia_equipment': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'phone': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'total_capacity': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'translate_equipment': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'type': ('functions.custom_fields.EnumField', [], {'default': "'Convention centre'", 'values': "['Convention centre', 'Exposition centre']"}), - 'url': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), - 'video_link': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'views': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'virtual_tour': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'web_page': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'wifi': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}) - }, - u'place_exposition.placeexposition': { - 'Meta': {'ordering': "['-rating', 'id']", 'unique_together': '()', 'object_name': 'PlaceExposition', 'index_together': '()'}, - 'address': ('functions.custom_fields.LocationField', [], {}), - 'bank': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'business_centre': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'cafe': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'children_room': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'city': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'place_expositions'", 'on_delete': 'models.PROTECT', 'to': u"orm['city.City']"}), - 'closed_area': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'conference_centre': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['country.Country']", 'on_delete': 'models.PROTECT'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'disabled_service': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'event_in_year': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'fax': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'foundation_year': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_published': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'blank': 'True'}), - 'mobile_application': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'online_registration': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'open_area': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'parking': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'partner': ('django.db.models.fields.NullBooleanField', [], {'default': '0', 'null': 'True', 'blank': 'True'}), - 'phone': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'photogallery': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['photologue.Gallery']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), - 'press_centre': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'rating': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'terminals': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'total_area': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'total_halls': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'total_pavilions': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'type': ('functions.custom_fields.EnumField', [], {'default': "'Exposition complex'", 'values': "['Exposition complex', 'Convention centre', 'Exposition centre']"}), - 'url': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), - 'views': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'virtual_tour': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'web_page': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'wifi': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}) - }, - u'sites.site': { - 'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"}, - 'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 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.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': ('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'translator.translator': { - 'Meta': {'unique_together': '()', 'object_name': 'Translator', 'index_together': '()'}, - 'birth': ('django.db.models.fields.DateField', [], {}), - 'car': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'gender': ('functions.custom_fields.EnumField', [], {'default': "'male'", 'values': "('male', 'female')"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['expobanner'] \ No newline at end of file diff --git a/expobanner/models.py b/expobanner/models.py index f33c15ff..a9b98d70 100644 --- a/expobanner/models.py +++ b/expobanner/models.py @@ -11,7 +11,8 @@ from .managers import BiasedManager, BannerGroupCached, URLCached, TopCached from .mixins import StatMixin from theme.models import Theme from country.models import Country -from multiselectfield import MultiSelectField +# from multiselectfield import MultiSelectField +# from functions.custom_fields import MonthMultiSelectField class URL(models.Model): @@ -282,7 +283,7 @@ class Top(models.Model, StatMixin): excluded_tags = models.ManyToManyField('theme.Tag', blank=True, null=True, verbose_name=u'Исключить теги') country = models.ManyToManyField('country.Country', blank=True, null=True, verbose_name=u'Страны') cities = models.ManyToManyField('city.City', related_name='top_in_set', blank=True, null=True, verbose_name=u'Города') - months = MultiSelectField(blank=True, null=True, default=None, max_length=255) + # months = MonthMultiSelectField(blank=True, null=True, default=None, max_length=255) excluded_cities = models.ManyToManyField('city.City', blank=True, null=True, verbose_name=u'Исключить города') fr = models.DateField(default=date.today(), verbose_name=u'Начало') to = models.DateField(blank=True, null=True, verbose_name=u'Конец') diff --git a/functions/custom_fields.py b/functions/custom_fields.py index 81f7a4d5..9fc52a09 100644 --- a/functions/custom_fields.py +++ b/functions/custom_fields.py @@ -1,10 +1,12 @@ # -*- coding: utf-8 -*- -from django.db import models -from django.core.serializers.json import DjangoJSONEncoder -from django.core import exceptions from django import forms -from django.utils.safestring import mark_safe from django.conf import settings +from django.core import exceptions +from django.core.serializers.json import DjangoJSONEncoder +from django.db import models +from django.utils.safestring import mark_safe +from south.modelsinspector import add_introspection_rules + try: import json except: @@ -225,7 +227,6 @@ class LocationField(JSONField): return super(LocationField, self).formfield(**defaults) -from south.modelsinspector import add_introspection_rules add_introspection_rules([ ( [EnumField], # Class(es) these apply to @@ -235,4 +236,3 @@ add_introspection_rules([ }, ), ], ["^functions\.custom_fields\.EnumField", "^functions\.custom_fields\.LocationField"]) -