# HG changeset patch # User rougeronj # Date 1427196268 -3600 # Node ID 92b01b2141928ca5ddd5ce77ab007f30b86d062c # Parent 03d4200ae80941b50dc1ba2c5dc384699cb2c36b# Parent 75ce4376a868a2a24e99d6f5f2c28b891ff8a1e8 Merging... diff -r 03d4200ae809 -r 92b01b214192 .hgtags --- a/.hgtags Tue Mar 24 12:16:06 2015 +0100 +++ b/.hgtags Tue Mar 24 12:24:28 2015 +0100 @@ -115,3 +115,30 @@ b1222084eb6bff4336846169d356ead6e0325865 V03.00-rc.03 9d396002af6dc058554e6bd45701b8ae434ad596 V03.00-rc.03 ef8bc1204620d56c96f3c148bb0c3173c227f96c V03.00-rc.04 +126397b447c96036edde53312676157d146f0d62 V03.00-rc.05 +2b38f2ecc13d2feb5db9ff9e84447bc2b8ee9301 V03.00-rc.06 +2b38f2ecc13d2feb5db9ff9e84447bc2b8ee9301 V03.00-rc.06 +fe706c358cc3b4dc2dfb518392238181de0e4b76 V03.00-rc.06 +fe706c358cc3b4dc2dfb518392238181de0e4b76 V03.00-rc.06 +37229294593d71a3fc5b43742fc03b9ce0e85d47 V03.00-rc.06 +37229294593d71a3fc5b43742fc03b9ce0e85d47 V03.00-rc.06 +68763b71c4d1981b4781cca37f0a315a8601fbdb V03.00-rc.06 +68763b71c4d1981b4781cca37f0a315a8601fbdb V03.00-rc.06 +c2f05549c044ad0bc10b4c02bdc666ab11c18cd8 V03.00-rc.06 +c2f05549c044ad0bc10b4c02bdc666ab11c18cd8 V03.00-rc.06 +f82f7bc4e13f63fa0b5c4874444b1a4395f0d285 V03.00-rc.06 +f82f7bc4e13f63fa0b5c4874444b1a4395f0d285 V03.00-rc.06 +1357a0cfdbf7944f9883db63f95277e72a6ad5d4 V03.00-rc.06 +1357a0cfdbf7944f9883db63f95277e72a6ad5d4 V03.00-rc.06 +0c094e04f343c8b94a0122c7449c19f2dfaa1ee5 V03.00-rc.06 +0c094e04f343c8b94a0122c7449c19f2dfaa1ee5 V03.00-rc.06 +e25de27cba8ceeec3abb2c7c638bbabdedeb7362 V03.00-rc.06 +e25de27cba8ceeec3abb2c7c638bbabdedeb7362 V03.00-rc.06 +31d3179935d90cf0cf5379a8b808434716773e56 V03.00-rc.06 +31d3179935d90cf0cf5379a8b808434716773e56 V03.00-rc.06 +8d8e31b1658d9a2bac49588def116ec2e9837c28 V03.00-rc.06 +8d8e31b1658d9a2bac49588def116ec2e9837c28 V03.00-rc.06 +6d7bfeb13072f70bae8f91fd6b15f9e371fc5368 V03.00-rc.06 +6d7bfeb13072f70bae8f91fd6b15f9e371fc5368 V03.00-rc.06 +d9642be7c9372f5b6d135d665a45827c1b4cd15e V03.00-rc.06 +c231285da494b9b153c991980604fcfa41082c4b V03.00-rc.07 diff -r 03d4200ae809 -r 92b01b214192 .settings/org.eclipse.core.resources.prefs --- a/.settings/org.eclipse.core.resources.prefs Tue Mar 24 12:16:06 2015 +0100 +++ b/.settings/org.eclipse.core.resources.prefs Tue Mar 24 12:24:28 2015 +0100 @@ -9,29 +9,14 @@ encoding//src/hdabo/management/commands/query_wikipedia.py=utf-8 encoding//src/hdabo/management/utils.py=utf-8 encoding//src/hdabo/migrations/0001_initial.py=utf-8 -encoding//src/hdabo/migrations/0002_backport_hdabo_sf.py=utf-8 -encoding//src/hdabo/migrations/0003_update_redirection.py=utf-8 -encoding//src/hdabo/migrations/0004_index_tag.py=utf-8 -encoding//src/hdabo/migrations/0005_auto__chg_field_datasheet_organisation.py=utf-8 -encoding//src/hdabo/migrations/0006_auto__add_user__chg_field_datasheet_validator.py=utf-8 -encoding//src/hdabo/migrations/0007_auto__add_folder.py=utf-8 -encoding//src/hdabo/migrations/0008_to_dbpedia_fr.py=utf-8 -encoding//src/hdabo/migrations/0009_auto__add_field_tag_natural_key.py=utf-8 -encoding//src/hdabo/migrations/0010_tag_natural_key.py=utf-8 -encoding//src/hdabo/migrations/0011_auto__chg_field_tag_natural_key.py=utf-8 -encoding//src/hdabo/migrations/0012_auto__add_field_domain_natural_key__add_field_timeperiod_natural_key.py=utf-8 -encoding//src/hdabo/migrations/0013_domain_period_natural_key.py=utf-8 -encoding//src/hdabo/migrations/0014_auto__chg_field_domain_natural_key__chg_field_timeperiod_natural_key.py=utf-8 -encoding//src/hdabo/migrations/0015_sanitize_organisation_hda_id.py=utf-8 -encoding//src/hdabo/migrations/0016_auto__add_field_tagcategory_natural_key.py=utf-8 -encoding//src/hdabo/migrations/0017_calculate_category_natural_key.py=utf-8 encoding//src/hdabo/models.py=utf-8 encoding//src/hdabo/search/french_whoosh_backend.py=utf-8 -encoding//src/hdabo/tests/models.py=utf-8 +encoding//src/hdabo/tests/test_models.py=utf-8 encoding//src/hdabo/utils.py=utf-8 encoding//src/hdabo/views.py=utf-8 encoding//src/hdabo/wp_utils.py=utf-8 encoding//src/hdalab/__init__.py=utf-8 +encoding//src/hdalab/apps.py=utf-8 encoding//src/hdalab/celery.py=utf-8 encoding//src/hdalab/config.py=utf-8 encoding//src/hdalab/fields.py=utf-8 @@ -52,18 +37,6 @@ encoding//src/hdalab/management/commands/send_moderation_mail.py=utf-8 encoding//src/hdalab/management/utils.py=utf-8 encoding//src/hdalab/migrations/0001_initial.py=utf-8 -encoding//src/hdalab/migrations/0002_dataviz.py=utf-8 -encoding//src/hdalab/migrations/0003_hdasession.py=utf-8 -encoding//src/hdalab/migrations/0004_remove_dbpedia_unicity.py=utf-8 -encoding//src/hdalab/migrations/0005_rename_end_year.py=utf-8 -encoding//src/hdalab/migrations/0006_dbpedia_fields_one_to_one.py=utf-8 -encoding//src/hdalab/migrations/0007_geographic_inclusion.py=utf-8 -encoding//src/hdalab/migrations/0008_datasheet_insee.py=utf-8 -encoding//src/hdalab/migrations/0011_auto__add_field_dbpediafieldstranslation_is_label_translated__add_fiel.py=utf-8 -encoding//src/hdalab/migrations/0012_auto__add_hdalabrenkan.py=utf-8 -encoding//src/hdalab/migrations/0013_auto__chg_field_dbpediafields_tag__add_unique_tagyears_tag.py=utf-8 -encoding//src/hdalab/migrations/0014_auto__add_hdalabrenkanstatetransition__chg_field_dbpediafields_tag.py=utf-8 -encoding//src/hdalab/migrations/0015_auto__add_field_hdalabrenkan_favorite.py=utf-8 encoding//src/hdalab/models/dataviz.py=utf-8 encoding//src/hdalab/models/renkan.py=utf-8 encoding//src/hdalab/services.py=utf-8 diff -r 03d4200ae809 -r 92b01b214192 sbin/sync/config.py.tmpl --- a/sbin/sync/config.py.tmpl Tue Mar 24 12:16:06 2015 +0100 +++ b/sbin/sync/config.py.tmpl Tue Mar 24 12:24:28 2015 +0100 @@ -1,6 +1,8 @@ from fabric.api import env from random import choice +env.migrate_method = 'migrate' + env.hosts = ['iri@web.iri.centrepompidou.fr'] env.web_group = 'www-data' diff -r 03d4200ae809 -r 92b01b214192 sbin/sync/fabfile.py --- a/sbin/sync/fabfile.py Tue Mar 24 12:16:06 2015 +0100 +++ b/sbin/sync/fabfile.py Tue Mar 24 12:24:28 2015 +0100 @@ -13,9 +13,9 @@ @task -def relaunch_server(do_collectstatic=True, do_syncdb=True, do_check_folder_access=True): +def relaunch_server(do_collectstatic=True, do_migrate=True, do_check_folder_access=True): print("Relaunch server") - do_relaunch_server(do_collectstatic, do_syncdb, env.get('check_folder_access',do_check_folder_access)) + do_relaunch_server(do_collectstatic, do_migrate, env.get('check_folder_access',do_check_folder_access)) @task def sync_web(version): diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/fixtures/datasheet_10.yaml.bz2 Binary file src/hdabo/fixtures/datasheet_10.yaml.bz2 has changed diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/management/commands/import_rdf.py --- a/src/hdabo/management/commands/import_rdf.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdabo/management/commands/import_rdf.py Tue Mar 24 12:24:28 2015 +0100 @@ -2,85 +2,6 @@ ''' Created on May 25, 2011 - -Compilation: - -#Install librdf -# install raptor2 : configure --prefix= + make + make install -# install librasql : PKG_CONFIG_PATH=/Users/ymh/dev/venvs/hdalab/lib/pkgconfig RAPTOR2_LIBS="-L/Users/ymh/dev/venvs/hdalab/lib -lraptor2" RAPTOR2_CFLAGS="-I/Users/ymh/dev/venvs/hdalab/include/raptor2" RAPTOR_VERSION=2.0.15 ./configure --prefix=/Users/ymh/dev/venvs/hdalab - - -raptor2-2.0.15 -configure --prefix=/Users/ymh/dev/venvs/hdalab - -rasqal-0.9.32: - -diff --git a/rasqal-0.9.32/configure b/rasqal-0.9.32.new/configure -index a29a606..b1dda08 100755 ---- a/rasqal-0.9.32/configure -+++ b/rasqal-0.9.32.new/configure -@@ -14105,7 +14105,7 @@ else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - -- RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null` -+ RAPTOR_VERSION="2.0.15" #`$PKG_CONFIG raptor2 --modversion 2>/dev/null` - raptor_too_old=0 - as_arg_v1=$RAPTOR_VERSION - as_arg_v2=$RAPTOR_MIN_VERSION - -RAPTOR2_LIBS="-L/Users/ymh/dev/venvs/hdalab/lib -lraptor2" RAPTOR2_CFLAGS="-I/Users/ymh/dev/venvs/hdalab/include/raptor2" RAPTOR_VERSION=2.0.15 ./configure --prefix=/Users/ymh/dev/venvs/hdalab - -sqlite: -./configure --prefix=/Users/ymh/dev/venvs/hdalab - -unixODBC: -./configure --prefix=/Users/ymh/dev/venvs/hdalab --enable-gui=no -make -make install - -redland-1.0.17: -CFLAGS="-I/Users/ymh/dev/venvs/hdalab/include" PKG_CONFIG_PATH=/Users/ymh/dev/venvs/hdalab/lib/pkgconfig RAPTOR2_LIBS="-L/Users/ymh/dev/venvs/hdalab/lib -lraptor2" RAPTOR2_CFLAGS="-I/Users/ymh/dev/venvs/hdalab/include/raptor2" RAPTOR_VERSION=2.0.15 RASQAL_LIBS="-L/Users/ymh/dev/venvs/hdalab/lib -lrasqal" RASQAL_CFLAGS="-I/Users/ymh/dev/venvs/hdalab/include/rasqal" ./configure --prefix=/Users/ymh/dev/venvs/hdalab - -redland-bindings -CFLAGS="-L/Users/ymh/dev/venvs/hdalab/lib -I/Users/ymh/dev/venvs/hdalab/include -I/Users/ymh/dev/venvs/hdalab/include/raptor2 -I/Users/ymh/dev/venvs/hdalab/include/rasqal -lraptor2 -lrasqal -lrdf" PKG_CONFIG_PATH=/Users/ymh/dev/venvs/hdalab/lib/pkgconfig RAPTOR2_LIBS="-L/Users/ymh/dev/venvs/hdalab/lib -lraptor2" RAPTOR2_CFLAGS="-I/Users/ymh/dev/venvs/hdalab/include/raptor2" RAPTOR_VERSION=2.0.15 RASQAL_LIBS="-L/Users/ymh/dev/venvs/hdalab/lib -lrasqal" RASQAL_CFLAGS="-I/Users/ymh/dev/venvs/hdalab/include/rasqal" ./configure --prefix=/Users/ymh/dev/venvs/hdalab --with-python=/Users/ymh/dev/venvs/hdalab/bin/python --with-python-ldflags="-L/Users/ymh/dev/venvs/hdalab/lib -L/System/Library/Frameworks/Python.framework/Versions/2.7/lib -lpython2.7 -v -Wl,-dylib" --with-python-libext=.so - - ---- -prerequisite: -- pkg-config: -./configure --prefix=/Users/ymh/dev/venvs/redland --with-internal-glib && make && make install - -- sqlite: -./configure --prefix=/Users/ymh/dev/venvs/redland && make && make install - -unixODBC: -./configure --prefix=/Users/ymh/dev/venvs/redland --enable-gui=no -make -make install - -raptor2-2.0.15 -configure --prefix=/Users/ymh/dev/venvs/hdalab -make -make install - - -rasqal-0.9.32 -configure --prefix=/Users/ymh/dev/venvs/hdalab -make -make install - -redland-1.0.17 -CFLAGS="-I/Users/ymh/dev/venvs/redland/include" ./configure --prefix=/Users/ymh/dev/venvs/redland -make -make install - -redland-bindings-1.0.17.1 -./configure --prefix=/Users/ymh/dev/venvs/redland --with-python=/Users/ymh/dev/venvs/redland/bin/python --with-python-ldflags="-L/Library/Frameworks/Python.framework/Versions/2.7/lib -lpython2.7 -Wl,-dylib -make -make install - - - after `import_rdf` call commands `import_hdabo_db -c` then `rebuild_index` @author: ymh @@ -917,7 +838,6 @@ if any([t not in TYPES_LIST for t in self.types_list]): raise CommandError("Types is %r : all types mus be in %r" % (self.types_list, TYPES_LIST)) - models.register_models('import_rdf', ProcessedObjects) connection = connections[DEFAULT_DB_ALIAS] sql_temp, _ = connection.creation.sql_create_model(ProcessedObjects, no_style(), []) cursor = connection.cursor() diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0001_initial.py --- a/src/hdabo/migrations/0001_initial.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdabo/migrations/0001_initial.py Tue Mar 24 12:24:28 2015 +0100 @@ -1,455 +1,416 @@ -#@PydevCodeAnalysisIgnore -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - #create auth_user table here to adjust to application dependencies - db.create_table('auth_user', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('password', self.gf('django.db.models.fields.CharField')(max_length=128)), - ('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), - ('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)), - ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), - ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), - ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, blank=True)), - ('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)), - ('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), - )) - - - # Adding model 'Organisation' - db.create_table('hdabo_organisation', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('hda_id', self.gf('django.db.models.fields.CharField')(unique=True, max_length=512)), - ('name', self.gf('django.db.models.fields.CharField')(max_length=512)), - ('location', self.gf('django.db.models.fields.CharField')(max_length=512, null=True, blank=True)), - ('website', self.gf('django.db.models.fields.CharField')(max_length=2048, null=True, blank=True)), - )) - db.send_create_signal('hdabo', ['Organisation']) - - # Adding model 'Author' - db.create_table('hdabo_author', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('hda_id', self.gf('django.db.models.fields.CharField')(unique=True, max_length=512)), - ('lastname', self.gf('django.db.models.fields.CharField')(max_length=512, null=True, blank=True)), - ('firstname', self.gf('django.db.models.fields.CharField')(max_length=512, null=True, blank=True)), - )) - db.send_create_signal('hdabo', ['Author']) - - # Adding model 'TimePeriod' - db.create_table('hdabo_timeperiod', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('label', self.gf('django.db.models.fields.CharField')(max_length=512)), - ('school_period', self.gf('django.db.models.fields.IntegerField')()), - )) - db.send_create_signal('hdabo', ['TimePeriod']) - - # Adding unique constraint on 'TimePeriod', fields ['label', 'school_period'] - db.create_unique('hdabo_timeperiod', ['label', 'school_period']) - - # Adding model 'Domain' - db.create_table('hdabo_domain', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('label', self.gf('django.db.models.fields.CharField')(max_length=512)), - ('school_period', self.gf('django.db.models.fields.IntegerField')()), - )) - db.send_create_signal('hdabo', ['Domain']) - - # Adding unique constraint on 'Domain', fields ['label', 'school_period'] - db.create_unique('hdabo_domain', ['label', 'school_period']) - - # Adding model 'DocumentFormat' - db.create_table('hdabo_documentformat', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('label', self.gf('django.db.models.fields.CharField')(unique=True, max_length=512)), - )) - db.send_create_signal('hdabo', ['DocumentFormat']) - - # Adding model 'TagCategory' - db.create_table('hdabo_tagcategory', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('label', self.gf('django.db.models.fields.CharField')(unique=True, max_length=512)), - )) - db.send_create_signal('hdabo', ['TagCategory']) - - # Adding model 'Tag' - db.create_table('hdabo_tag', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('label', self.gf('django.db.models.fields.CharField')(max_length=1024, db_index=True)), - ('normalized_label', self.gf('django.db.models.fields.CharField')(max_length=1024, db_index=True)), - ('original_label', self.gf('django.db.models.fields.CharField')(max_length=1024)), - ('alias', self.gf('django.db.models.fields.CharField')(max_length=1024, null=True, blank=True)), - ('category', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.TagCategory'], null=True, blank=True)), - ('wikipedia_url', self.gf('django.db.models.fields.URLField')(max_length=2048, null=True, blank=True)), - ('wikipedia_pageid', self.gf('django.db.models.fields.BigIntegerField')(null=True, blank=True)), - ('url_status', self.gf('django.db.models.fields.IntegerField')(default=None, null=True, blank=True)), - ('dbpedia_uri', self.gf('django.db.models.fields.URLField')(max_length=2048, null=True, blank=True)), - ('popularity', self.gf('django.db.models.fields.IntegerField')(default=0, db_index=True)), - )) - db.send_create_signal('hdabo', ['Tag']) - - # Adding unique constraint on 'Tag', fields ['label', 'original_label', 'url_status'] - db.create_unique('hdabo_tag', ['label', 'original_label', 'url_status']) +# -*- coding: utf-8 -*- +from __future__ import unicode_literals - # Adding model 'Location' - db.create_table('hdabo_location', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('name', self.gf('django.db.models.fields.CharField')(max_length=512)), - ('insee', self.gf('django.db.models.fields.CharField')(unique=True, max_length=5)), - )) - db.send_create_signal('hdabo', ['Location']) - - # Adding model 'Datasheet' - db.create_table('hdabo_datasheet', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('hda_id', self.gf('django.db.models.fields.CharField')(unique=True, max_length=512)), - ('author', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Author'], null=True, blank=True)), - ('organisation', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Organisation'])), - ('title', self.gf('django.db.models.fields.CharField')(max_length=2048)), - ('description', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), - ('url', self.gf('django.db.models.fields.URLField')(max_length=2048, null=True, blank=True)), - ('town', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Location'], null=True, blank=True)), - ('format', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.DocumentFormat'], null=True, blank=True)), - ('original_creation_date', self.gf('django.db.models.fields.DateField')()), - ('original_modification_date', self.gf('django.db.models.fields.DateField')()), - ('modification_datetime', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), - ('validation_date', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)), - ('validated', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)), - ('validator', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True)), - ('manual_order', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)), - )) - db.send_create_signal('hdabo', ['Datasheet']) - - # Adding model 'TaggedSheet' - db.create_table('hdabo_taggedsheet', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('datasheet', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Datasheet'])), - ('tag', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Tag'])), - ('original_order', self.gf('django.db.models.fields.IntegerField')(default=0)), - ('order', self.gf('django.db.models.fields.IntegerField')(default=0, db_index=True)), - ('index_note', self.gf('django.db.models.fields.FloatField')(default=0.0, db_index=True)), - ('wikipedia_revision_id', self.gf('django.db.models.fields.BigIntegerField')(null=True, blank=True)), - )) - db.send_create_signal('hdabo', ['TaggedSheet']) - - # Adding model 'Datasheet_domains' - db.create_table('hdabo_datasheet_domains', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('datasheet', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Datasheet'])), - ('sort_value', self.gf('django.db.models.fields.IntegerField')()), - ('domain', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Domain'])), - )) - db.send_create_signal('hdabo', ['Datasheet_domains']) - - # Adding model 'Datasheet_highschool_periods' - db.create_table('hdabo_datasheet_highschool_periods', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('datasheet', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Datasheet'])), - ('sort_value', self.gf('django.db.models.fields.IntegerField')()), - ('timeperiod', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.TimePeriod'])), - )) - db.send_create_signal('hdabo', ['Datasheet_highschool_periods']) - - # Adding model 'Datasheet_highschool_themes' - db.create_table('hdabo_datasheet_highschool_themes', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('datasheet', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Datasheet'])), - ('sort_value', self.gf('django.db.models.fields.IntegerField')()), - ('domain', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Domain'])), - )) - db.send_create_signal('hdabo', ['Datasheet_highschool_themes']) - - # Adding model 'Datasheet_college_periods' - db.create_table('hdabo_datasheet_college_periods', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('datasheet', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Datasheet'])), - ('sort_value', self.gf('django.db.models.fields.IntegerField')()), - ('timeperiod', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.TimePeriod'])), - )) - db.send_create_signal('hdabo', ['Datasheet_college_periods']) - - # Adding model 'Datasheet_college_themes' - db.create_table('hdabo_datasheet_college_themes', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('datasheet', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Datasheet'])), - ('sort_value', self.gf('django.db.models.fields.IntegerField')()), - ('domain', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Domain'])), - )) - db.send_create_signal('hdabo', ['Datasheet_college_themes']) - - # Adding model 'Datasheet_primary_periods' - db.create_table('hdabo_datasheet_primary_periods', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('datasheet', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Datasheet'])), - ('sort_value', self.gf('django.db.models.fields.IntegerField')()), - ('timeperiod', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.TimePeriod'])), - )) - db.send_create_signal('hdabo', ['Datasheet_primary_periods']) - - # Adding model 'Datasheet_primary_themes' - db.create_table('hdabo_datasheet_primary_themes', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('datasheet', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Datasheet'])), - ('sort_value', self.gf('django.db.models.fields.IntegerField')()), - ('domain', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Domain'])), - )) - db.send_create_signal('hdabo', ['Datasheet_primary_themes']) +from django.db import models, migrations +import django.utils.timezone +from django.conf import settings +import django.core.validators - def backwards(self, orm): - - # Removing unique constraint on 'Tag', fields ['label', 'original_label', 'url_status'] - db.delete_unique('hdabo_tag', ['label', 'original_label', 'url_status']) - - # Removing unique constraint on 'Domain', fields ['label', 'school_period'] - db.delete_unique('hdabo_domain', ['label', 'school_period']) - - # Removing unique constraint on 'TimePeriod', fields ['label', 'school_period'] - db.delete_unique('hdabo_timeperiod', ['label', 'school_period']) - - # Deleting model 'Organisation' - db.delete_table('hdabo_organisation') - - # Deleting model 'Author' - db.delete_table('hdabo_author') - - # Deleting model 'TimePeriod' - db.delete_table('hdabo_timeperiod') - - # Deleting model 'Domain' - db.delete_table('hdabo_domain') - - # Deleting model 'DocumentFormat' - db.delete_table('hdabo_documentformat') - - # Deleting model 'TagCategory' - db.delete_table('hdabo_tagcategory') - - # Deleting model 'Tag' - db.delete_table('hdabo_tag') +class Migration(migrations.Migration): - # Deleting model 'Location' - db.delete_table('hdabo_location') - - # Deleting model 'Datasheet' - db.delete_table('hdabo_datasheet') - - # Deleting model 'TaggedSheet' - db.delete_table('hdabo_taggedsheet') - - # Deleting model 'Datasheet_domains' - db.delete_table('hdabo_datasheet_domains') - - # Deleting model 'Datasheet_highschool_periods' - db.delete_table('hdabo_datasheet_highschool_periods') - - # Deleting model 'Datasheet_highschool_themes' - db.delete_table('hdabo_datasheet_highschool_themes') - - # Deleting model 'Datasheet_college_periods' - db.delete_table('hdabo_datasheet_college_periods') - - # Deleting model 'Datasheet_college_themes' - db.delete_table('hdabo_datasheet_college_themes') - - # Deleting model 'Datasheet_primary_periods' - db.delete_table('hdabo_datasheet_primary_periods') - - # Deleting model 'Datasheet_primary_themes' - db.delete_table('hdabo_datasheet_primary_themes') - - # delete table auth_user - db.delete_table('auth_user') - + dependencies = [ + ('auth', '0001_initial'), + ] - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_themes']", 'to': "orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_domains']", 'to': "orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_themes']", 'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Organisation']"}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_themes']", 'to': "orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['hdabo.Tag']", 'through': "orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - 'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - 'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - } - } - - complete_apps = ['hdabo'] + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(default=django.utils.timezone.now, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, max_length=30, verbose_name='username', validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username.', 'invalid')])), + ('first_name', models.CharField(max_length=30, verbose_name='first name', blank=True)), + ('last_name', models.CharField(max_length=30, verbose_name='last name', blank=True)), + ('email', models.EmailField(max_length=75, verbose_name='email address', blank=True)), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('groups', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Permission', blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions')), + ], + options={ + 'db_table': 'auth_user', + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Author', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('hda_id', models.CharField(unique=True, max_length=512)), + ('lastname', models.CharField(max_length=512, null=True, blank=True)), + ('firstname', models.CharField(max_length=512, null=True, blank=True)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Datasheet', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('hda_id', models.CharField(unique=True, max_length=512)), + ('title', models.CharField(max_length=2048, serialize=False)), + ('description', models.TextField(serialize=False, null=True, blank=True)), + ('url', models.URLField(serialize=False, max_length=2048, null=True, blank=True)), + ('original_creation_date', models.DateField(serialize=False)), + ('original_modification_date', models.DateField(serialize=False)), + ('modification_datetime', models.DateTimeField(auto_now=True, serialize=False)), + ('validation_date', models.DateTimeField(serialize=False, null=True, blank=True)), + ('validated', models.BooleanField(default=False, db_index=True)), + ('manual_order', models.BooleanField(default=False, serialize=False, db_index=True)), + ('author', models.ForeignKey(serialize=False, blank=True, to='hdabo.Author', null=True)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Datasheet_college_periods', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('sort_value', models.IntegerField()), + ('datasheet', models.ForeignKey(to='hdabo.Datasheet')), + ], + options={ + 'ordering': ['sort_value'], + 'abstract': False, + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Datasheet_college_themes', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('sort_value', models.IntegerField()), + ('datasheet', models.ForeignKey(to='hdabo.Datasheet')), + ], + options={ + 'ordering': ['sort_value'], + 'abstract': False, + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Datasheet_domains', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('sort_value', models.IntegerField()), + ('datasheet', models.ForeignKey(to='hdabo.Datasheet')), + ], + options={ + 'ordering': ['sort_value'], + 'abstract': False, + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Datasheet_highschool_periods', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('sort_value', models.IntegerField()), + ('datasheet', models.ForeignKey(to='hdabo.Datasheet')), + ], + options={ + 'ordering': ['sort_value'], + 'abstract': False, + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Datasheet_highschool_themes', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('sort_value', models.IntegerField()), + ('datasheet', models.ForeignKey(to='hdabo.Datasheet')), + ], + options={ + 'ordering': ['sort_value'], + 'abstract': False, + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Datasheet_primary_periods', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('sort_value', models.IntegerField()), + ('datasheet', models.ForeignKey(to='hdabo.Datasheet')), + ], + options={ + 'ordering': ['sort_value'], + 'abstract': False, + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Datasheet_primary_themes', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('sort_value', models.IntegerField()), + ('datasheet', models.ForeignKey(to='hdabo.Datasheet')), + ], + options={ + 'ordering': ['sort_value'], + 'abstract': False, + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='DocumentFormat', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('label', models.CharField(unique=True, max_length=512)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Domain', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('label', models.CharField(max_length=512)), + ('school_period', models.IntegerField(choices=[(0, 'Global'), (1, 'Primaire'), (2, 'Coll\xe8ge'), (3, 'Lyc\xe9e')])), + ('natural_key', models.CharField(unique=True, max_length=512)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Folder', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('url', models.URLField(unique=True, max_length=2048)), + ('title', models.CharField(max_length=2048, null=True, blank=True)), + ('description', models.TextField(null=True, blank=True)), + ('datasheets', models.ManyToManyField(to='hdabo.Datasheet')), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Location', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('name', models.CharField(max_length=512)), + ('insee', models.CharField(unique=True, max_length=5)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Organisation', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('hda_id', models.CharField(unique=True, max_length=512)), + ('name', models.CharField(max_length=512)), + ('location', models.CharField(max_length=512, null=True, blank=True)), + ('website', models.CharField(max_length=2048, null=True, blank=True)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='Tag', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('label', models.CharField(max_length=1024, db_index=True)), + ('alternative_label', models.CharField(max_length=1024, null=True, blank=True)), + ('normalized_label', models.CharField(max_length=1024, editable=False, db_index=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('original_label', models.CharField(max_length=1024, editable=False)), + ('alias', models.CharField(max_length=1024, null=True, blank=True)), + ('wikipedia_url', models.URLField(db_index=True, max_length=2048, null=True, blank=True)), + ('wikipedia_pageid', models.BigIntegerField(db_index=True, null=True, blank=True)), + ('alternative_wikipedia_url', models.URLField(db_index=True, max_length=2048, null=True, blank=True)), + ('alternative_wikipedia_pageid', models.BigIntegerField(db_index=True, null=True, blank=True)), + ('url_status', models.IntegerField(default=None, null=True, db_index=True, blank=True, choices=[(0, b'null_result'), (1, b'redirection'), (2, b'homonyme'), (3, b'match'), (4, b'unsematized')])), + ('dbpedia_uri', models.URLField(db_index=True, max_length=2048, null=True, blank=True)), + ('popularity', models.IntegerField(default=0, db_index=True)), + ('natural_key', models.CharField(max_length=7168, db_index=True)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='TagCategory', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('label', models.CharField(unique=True, max_length=512)), + ('natural_key', models.CharField(max_length=512, db_index=True)), + ], + options={ + 'verbose_name_plural': 'TagCategories', + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='TaggedSheet', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('original_order', models.IntegerField(default=0)), + ('order', models.IntegerField(default=0, db_index=True)), + ('index_note', models.FloatField(default=0.0, db_index=True)), + ('wikipedia_revision_id', models.BigIntegerField(null=True, blank=True)), + ('datasheet', models.ForeignKey(to='hdabo.Datasheet')), + ('tag', models.ForeignKey(to='hdabo.Tag')), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='TimePeriod', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('label', models.CharField(max_length=512)), + ('school_period', models.IntegerField(choices=[(1, 'Primaire'), (2, 'Coll\xe8ge'), (3, 'Lyc\xe9e')])), + ('natural_key', models.CharField(unique=True, max_length=512)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.AlterUniqueTogether( + name='timeperiod', + unique_together=set([('label', 'school_period')]), + ), + migrations.AddField( + model_name='tag', + name='category', + field=models.ForeignKey(blank=True, to='hdabo.TagCategory', null=True), + preserve_default=True, + ), + migrations.AlterUniqueTogether( + name='tag', + unique_together=set([('label', 'original_label', 'url_status')]), + ), + migrations.AlterUniqueTogether( + name='domain', + unique_together=set([('label', 'school_period')]), + ), + migrations.AddField( + model_name='datasheet_primary_themes', + name='domain', + field=models.ForeignKey(to='hdabo.Domain'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet_primary_periods', + name='timeperiod', + field=models.ForeignKey(to='hdabo.TimePeriod'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet_highschool_themes', + name='domain', + field=models.ForeignKey(to='hdabo.Domain'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet_highschool_periods', + name='timeperiod', + field=models.ForeignKey(to='hdabo.TimePeriod'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet_domains', + name='domain', + field=models.ForeignKey(to='hdabo.Domain'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet_college_themes', + name='domain', + field=models.ForeignKey(to='hdabo.Domain'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet_college_periods', + name='timeperiod', + field=models.ForeignKey(to='hdabo.TimePeriod'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet', + name='college_periods', + field=models.ManyToManyField(related_name='college_periods_datasheets', serialize=False, through='hdabo.Datasheet_college_periods', to='hdabo.TimePeriod'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet', + name='college_themes', + field=models.ManyToManyField(related_name='college_themes_datasheets', serialize=False, through='hdabo.Datasheet_college_themes', to='hdabo.Domain'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet', + name='domains', + field=models.ManyToManyField(related_name='datasheets', serialize=False, through='hdabo.Datasheet_domains', to='hdabo.Domain'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet', + name='format', + field=models.ForeignKey(serialize=False, blank=True, to='hdabo.DocumentFormat', null=True), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet', + name='highschool_periods', + field=models.ManyToManyField(related_name='highschool_periods_datasheets', serialize=False, through='hdabo.Datasheet_highschool_periods', to='hdabo.TimePeriod'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet', + name='highschool_themes', + field=models.ManyToManyField(related_name='highschool_themes_datasheets', serialize=False, through='hdabo.Datasheet_highschool_themes', to='hdabo.Domain'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet', + name='organisation', + field=models.ForeignKey(serialize=False, to='hdabo.Organisation', null=True), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet', + name='primary_periods', + field=models.ManyToManyField(related_name='primary_periods_datasheets', serialize=False, through='hdabo.Datasheet_primary_periods', to='hdabo.TimePeriod'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet', + name='primary_themes', + field=models.ManyToManyField(related_name='primary_themes_datasheets', serialize=False, through='hdabo.Datasheet_primary_themes', to='hdabo.Domain'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet', + name='tags', + field=models.ManyToManyField(to='hdabo.Tag', serialize=False, through='hdabo.TaggedSheet'), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet', + name='town', + field=models.ForeignKey(serialize=False, blank=True, to='hdabo.Location', null=True), + preserve_default=True, + ), + migrations.AddField( + model_name='datasheet', + name='validator', + field=models.ForeignKey(serialize=False, blank=True, to=settings.AUTH_USER_MODEL, null=True), + preserve_default=True, + ), + ] diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0002_backport_hdabo_sf.py --- a/src/hdabo/migrations/0002_backport_hdabo_sf.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,231 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding field 'Tag.alternative_label' - db.add_column('hdabo_tag', 'alternative_label', self.gf('django.db.models.fields.CharField')(max_length=1024, null=True, blank=True), keep_default=False) #@UndefinedVariable - - # Adding field 'Tag.created_at' - db.add_column('hdabo_tag', 'created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime.utcnow, blank=True), keep_default=False) #@UndefinedVariable - - # Adding field 'Tag.alternative_wikipedia_url' - db.add_column('hdabo_tag', 'alternative_wikipedia_url', self.gf('django.db.models.fields.URLField')(max_length=2048, null=True, blank=True), keep_default=False) #@UndefinedVariable - - # Adding field 'Tag.alternative_wikipedia_pageid' - db.add_column('hdabo_tag', 'alternative_wikipedia_pageid', self.gf('django.db.models.fields.BigIntegerField')(null=True, blank=True), keep_default=False) #@UndefinedVariable - - # Adding field 'TaggedSheet.created_at' - db.add_column('hdabo_taggedsheet', 'created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime.utcnow, blank=True), keep_default=False) #@UndefinedVariable - - - def backwards(self, orm): - - # Deleting field 'Tag.alternative_label' - db.delete_column('hdabo_tag', 'alternative_label') #@UndefinedVariable - - # Deleting field 'Tag.created_at' - db.delete_column('hdabo_tag', 'created_at') #@UndefinedVariable - - # Deleting field 'Tag.alternative_wikipedia_url' - db.delete_column('hdabo_tag', 'alternative_wikipedia_url') #@UndefinedVariable - - # Deleting field 'Tag.alternative_wikipedia_pageid' - db.delete_column('hdabo_tag', 'alternative_wikipedia_pageid') #@UndefinedVariable - - # Deleting field 'TaggedSheet.created_at' - db.delete_column('hdabo_taggedsheet', 'created_at') #@UndefinedVariable - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_themes']", 'to': "orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_domains']", 'to': "orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_themes']", 'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Organisation']"}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_themes']", 'to': "orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['hdabo.Tag']", 'through': "orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - 'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - 'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - } - } - - complete_apps = ['hdabo'] diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0003_update_redirection.py --- a/src/hdabo/migrations/0003_update_redirection.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,224 +0,0 @@ -# encoding: utf-8 -from south.v2 import DataMigration -from hdabo import utils, wp_utils -import sys -from wikitools import wiki - -class Migration(DataMigration): - - def forwards(self, orm): - queryset = orm.Tag.objects.filter(url_status=1, alternative_label=None) - queryset_count = queryset.count() - - sys.stdout.write("Processing %d tags\n" % (queryset_count)) - sys.stdout.flush() - - if queryset_count == 0: - return - site = wiki.Wiki("http://fr.wikipedia.org/w/api.php") #@UndefinedVariable - - - for i,tag in enumerate(queryset): - utils.show_progress(i+1, queryset_count, tag.label, 50) - wp_res = wp_utils.query_wikipedia_title(site, pageid=tag.wikipedia_pageid) - tag.alternative_label = wp_res['alternative_label'] - tag.alternative_wikipedia_url = wp_res['alternative_wikipedia_url'] - tag.alternative_wikipedia_pageid = wp_res['alternative_pageid'] - tag.save() - - sys.stdout.write("\n") - sys.stdout.flush() - - - def backwards(self, orm): - pass - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_themes']", 'to': "orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_domains']", 'to': "orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_themes']", 'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Organisation']"}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_themes']", 'to': "orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['hdabo.Tag']", 'through': "orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - 'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - 'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - } - } - - complete_apps = ['hdabo'] diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0004_index_tag.py --- a/src/hdabo/migrations/0004_index_tag.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,236 +0,0 @@ -# encoding: utf-8 -from south.db import db -from south.v2 import SchemaMigration - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding index on 'Tag', fields ['wikipedia_pageid'] - db.create_index('hdabo_tag', ['wikipedia_pageid']) - - # Adding index on 'Tag', fields ['wikipedia_url'] - db.create_index('hdabo_tag', ['wikipedia_url']) - - # Adding index on 'Tag', fields ['alternative_wikipedia_url'] - db.create_index('hdabo_tag', ['alternative_wikipedia_url']) - - # Adding index on 'Tag', fields ['url_status'] - db.create_index('hdabo_tag', ['url_status']) - - # Adding index on 'Tag', fields ['dbpedia_uri'] - db.create_index('hdabo_tag', ['dbpedia_uri']) - - # Adding index on 'Tag', fields ['alternative_wikipedia_pageid'] - db.create_index('hdabo_tag', ['alternative_wikipedia_pageid']) - - - def backwards(self, orm): - - # Removing index on 'Tag', fields ['alternative_wikipedia_pageid'] - db.delete_index('hdabo_tag', ['alternative_wikipedia_pageid']) - - # Removing index on 'Tag', fields ['dbpedia_uri'] - db.delete_index('hdabo_tag', ['dbpedia_uri']) - - # Removing index on 'Tag', fields ['url_status'] - db.delete_index('hdabo_tag', ['url_status']) - - # Removing index on 'Tag', fields ['alternative_wikipedia_url'] - db.delete_index('hdabo_tag', ['alternative_wikipedia_url']) - - # Removing index on 'Tag', fields ['wikipedia_url'] - db.delete_index('hdabo_tag', ['wikipedia_url']) - - # Removing index on 'Tag', fields ['wikipedia_pageid'] - db.delete_index('hdabo_tag', ['wikipedia_pageid']) - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_themes']", 'to': "orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_domains']", 'to': "orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_themes']", 'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Organisation']"}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_themes']", 'to': "orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['hdabo.Tag']", 'through': "orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - 'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - 'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - } - } - - complete_apps = ['hdabo'] diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0005_auto__chg_field_datasheet_organisation.py --- a/src/hdabo/migrations/0005_auto__chg_field_datasheet_organisation.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,208 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Datasheet.organisation' - db.alter_column('hdabo_datasheet', 'organisation_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.Organisation'], null=True)) - - - def backwards(self, orm): - - # User chose to not deal with backwards NULL issues for 'Datasheet.organisation' - raise RuntimeError("Cannot reverse this migration. 'Datasheet.organisation' and its values cannot be restored.") - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 6, 21, 18, 18, 22, 503161)'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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(2012, 6, 21, 18, 18, 22, 503032)'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_themes']", 'to': "orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_domains']", 'to': "orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_themes']", 'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_themes']", 'to': "orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['hdabo.Tag']", 'through': "orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - 'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - 'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - } - } - - complete_apps = ['hdabo'] diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0006_auto__add_user__chg_field_datasheet_validator.py --- a/src/hdabo/migrations/0006_auto__add_user__chg_field_datasheet_validator.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,255 +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): - - needed_by = [ - ('renkanmanager','0001_initial'), - ] - - def forwards(self, orm): - # Adding model 'User' - #Table creation moved to 0001_initial to fix initial dependencies -# db.create_table('auth_user', ( -# (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), -# ('password', self.gf('django.db.models.fields.CharField')(max_length=128)), -# ('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), -# ('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)), -# ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)), -# ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), -# ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), -# ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, blank=True)), -# ('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)), -# ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)), -# ('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), -# )) - db.send_create_signal(u'hdabo', ['User']) - - # Adding M2M table for field groups on 'User' - m2m_table_name = db.shorten_name('auth_user_groups') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('user', models.ForeignKey(orm[u'hdabo.user'], null=False)), - ('group', models.ForeignKey(orm[u'auth.group'], null=False)) - )) - db.create_unique(m2m_table_name, ['user_id', 'group_id']) - - # Adding M2M table for field user_permissions on 'User' - m2m_table_name = db.shorten_name('auth_user_user_permissions') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('user', models.ForeignKey(orm[u'hdabo.user'], null=False)), - ('permission', models.ForeignKey(orm[u'auth.permission'], null=False)) - )) - db.create_unique(m2m_table_name, ['user_id', 'permission_id']) - - - # Changing field 'Datasheet.validator' - db.alter_column(u'hdabo_datasheet', 'validator_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.User'], null=True)) - - def backwards(self, orm): - # Deleting model 'User' - db.delete_table('auth_user') - - # Removing M2M table for field groups on 'User' - db.delete_table(db.shorten_name('auth_user_groups')) - - # Removing M2M table for field user_permissions on 'User' - db.delete_table(db.shorten_name('auth_user_user_permissions')) - - - # Changing field 'Datasheet.validator' - db.alter_column(u'hdabo_datasheet', 'validator_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True)) - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0007_auto__add_folder.py --- a/src/hdabo/migrations/0007_auto__add_folder.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,233 +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 model 'Folder' - db.create_table(u'hdabo_folder', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('url', self.gf('django.db.models.fields.URLField')(unique=True, max_length=2048)), - ('title', self.gf('django.db.models.fields.CharField')(max_length=2048, null=True, blank=True)), - ('description', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), - )) - db.send_create_signal(u'hdabo', ['Folder']) - - # Adding M2M table for field datasheets on 'Folder' - m2m_table_name = db.shorten_name(u'hdabo_folder_datasheets') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('folder', models.ForeignKey(orm[u'hdabo.folder'], null=False)), - ('datasheet', models.ForeignKey(orm[u'hdabo.datasheet'], null=False)) - )) - db.create_unique(m2m_table_name, ['folder_id', 'datasheet_id']) - - - def backwards(self, orm): - # Deleting model 'Folder' - db.delete_table(u'hdabo_folder') - - # Removing M2M table for field datasheets on 'Folder' - db.delete_table(db.shorten_name(u'hdabo_folder_datasheets')) - - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.folder': { - 'Meta': {'object_name': 'Folder'}, - 'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0008_to_dbpedia_fr.py --- a/src/hdabo/migrations/0008_to_dbpedia_fr.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,277 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models -from django.conf import settings -from hdabo.utils import show_progress -from SPARQLWrapper import SPARQLWrapper, JSON - - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Don't use "from appname.models import ModelName". - # Use orm.ModelName to refer to models in this application, - # and orm['appname.ModelName'] for models in other applications. - queryset = orm['hdabo.tag'].objects.all() - endpoint = SPARQLWrapper(settings.DBPEDIA_URI_TEMPLATE % ( 'sparql', '' ), returnFormat=JSON) - - # First pass with page id - print "First pass" - self.update_queryset(endpoint, queryset, "select distinct * where { ?s dbpedia-owl:wikiPageID %s }", "pageid", True) - - # Second pass with wikipedia url - queryset = orm['hdabo.tag'].objects.filter(dbpedia_uri="") - print "Second pass" - self.update_queryset(endpoint, queryset, "select distinct * where { ?s foaf:isPrimaryTopicOf <%s> }") - - # Second pass with wikipedia url - queryset = orm['hdabo.tag'].objects.filter(dbpedia_uri="") - print "Third pass" - self.update_queryset(endpoint, queryset, 'select distinct * where { ?s rdfs:label "%s"@fr . FILTER (regex(?s, "^http\\\\://[^:]+$")) }', "label") - - - print "\n" - - def update_queryset(self, endpoint, queryset, query, param="url", empty_after=False): - queryset_count = queryset.count() - print "Processing %d tags\n" % (queryset_count) - for i,tag in enumerate(queryset): - show_progress(i+1, queryset_count, tag.label, 50) - if tag.wikipedia_url and tag.wikipedia_url!="": - p = tag.wikipedia_url - if param=="pageid": - p = tag.wikipedia_pageid - if param=="label": - p = tag.label - endpoint.setQuery(query % p) - res = endpoint.queryAndConvert() - if 'results' in res and 'bindings' in res['results']: - l = len(res['results']['bindings']) - if l==1: - tag.dbpedia_uri = res['results']['bindings'][0]['s']['value'] - tag.save() - #print "1 : " + tag.label.encode("utf8") + " : " + tag.dbpedia_uri.encode("utf8") - continue - elif l>1: - done = False - for b in res['results']['bindings']: - uri = b['s']['value'] - uri_label = uri[uri.rfind("/")+1:] - if uri_label==tag.label.replace(" ","/"): - tag.dbpedia_uri = res['results']['bindings'][0]['s']['value'] - #print "2 : " + tag.label.encode("utf8") + " : " + tag.dbpedia_uri.encode("utf8") - tag.save() - done = True - continue - if done: - continue - - if empty_after: - #print "3 : " + tag.label.encode("utf8") - tag.dbpedia_uri = None - tag.save() - - - def backwards(self, orm): - "Write your backwards methods here." - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.folder': { - 'Meta': {'object_name': 'Folder'}, - 'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] - symmetrical = True diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0009_auto__add_field_tag_natural_key.py --- a/src/hdabo/migrations/0009_auto__add_field_tag_natural_key.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,216 +0,0 @@ -# -*- coding: utf-8 -*- -from south.db import db -from south.v2 import SchemaMigration - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Tag.natural_key' - db.add_column(u'hdabo_tag', 'natural_key', - self.gf('django.db.models.fields.CharField')(db_index=True, max_length=7168, null=True, blank=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Tag.natural_key' - db.delete_column(u'hdabo_tag', 'natural_key') - - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.folder': { - 'Meta': {'object_name': 'Folder'}, - 'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '7168', 'null': 'True', 'blank': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0010_tag_natural_key.py --- a/src/hdabo/migrations/0010_tag_natural_key.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,230 +0,0 @@ -# -*- coding: utf-8 -*- - -from south.v2 import DataMigration - -from hdabo import utils - - -def calculate_natural_key(tag): - parts = [ - utils.sanitize(tag.label), - utils.sanitize(tag.normalized_label), - utils.sanitize(tag.original_label), - tag.wikipedia_url.split("/")[-1].rstrip('/') if tag.wikipedia_url else "" - ] - return ('_'.join(parts))[:7168] - - -class Migration(DataMigration): - - def forwards(self, orm): - total_line = orm.Tag.objects.count() - for i,tag in enumerate(orm.Tag.objects.all()): - utils.show_progress(i+1, total_line, "Processing %r " % tag.label, 50) - tag.natural_key = calculate_natural_key(tag) - tag.save() - # Note: Don't use "from appname.models import ModelName". - # Use orm.ModelName to refer to models in this application, - # and orm['appname.ModelName'] for models in other applications. - - def backwards(self, orm): - orm.Tag.objects.all().update(natural_key=None) - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.folder': { - 'Meta': {'object_name': 'Folder'}, - 'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '7168', 'null': 'True', 'blank': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] - symmetrical = True diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0011_auto__chg_field_tag_natural_key.py --- a/src/hdabo/migrations/0011_auto__chg_field_tag_natural_key.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,214 +0,0 @@ -# -*- coding: utf-8 -*- -from south.db import db -from south.v2 import SchemaMigration - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Tag.natural_key' - db.alter_column(u'hdabo_tag', 'natural_key', self.gf('django.db.models.fields.CharField')(default='_', max_length=7168)) - - def backwards(self, orm): - - # Changing field 'Tag.natural_key' - db.alter_column(u'hdabo_tag', 'natural_key', self.gf('django.db.models.fields.CharField')(max_length=7168, null=True)) - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.folder': { - 'Meta': {'object_name': 'Folder'}, - 'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '7168', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0012_auto__add_field_domain_natural_key__add_field_timeperiod_natural_key.py --- a/src/hdabo/migrations/0012_auto__add_field_domain_natural_key__add_field_timeperiod_natural_key.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,226 +0,0 @@ -# -*- coding: utf-8 -*- -from south.db import db -from south.v2 import SchemaMigration - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Domain.natural_key' - db.add_column(u'hdabo_domain', 'natural_key', - self.gf('django.db.models.fields.CharField')(max_length=512, unique=True, null=True), - keep_default=False) - - # Adding field 'TimePeriod.natural_key' - db.add_column(u'hdabo_timeperiod', 'natural_key', - self.gf('django.db.models.fields.CharField')(max_length=512, unique=True, null=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Domain.natural_key' - db.delete_column(u'hdabo_domain', 'natural_key') - - # Deleting field 'TimePeriod.natural_key' - db.delete_column(u'hdabo_timeperiod', 'natural_key') - - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '512', 'unique': 'True', 'null': 'True'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.folder': { - 'Meta': {'object_name': 'Folder'}, - 'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '7168', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '512', 'unique': 'True', 'null': 'True'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0013_domain_period_natural_key.py --- a/src/hdabo/migrations/0013_domain_period_natural_key.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,227 +0,0 @@ -# -*- coding: utf-8 -*- -from south.v2 import DataMigration - -from hdabo import utils - - -class Migration(DataMigration): - - def forwards(self, orm): - print("Stage 1 of 2 : procession Domains") - total_line = orm.Domain.objects.count() - for i,domain in enumerate(orm.Domain.objects.all()): - utils.show_progress(i+1, total_line, "Processing %r " % domain.label, 50) - domain.natural_key = utils.sanitize(domain.label).replace("-","") - domain.save() - - print("Stage 2 of 2 : procession Periods") - total_line = orm.TimePeriod.objects.count() - for i,period in enumerate(orm.TimePeriod.objects.all()): - utils.show_progress(i+1, total_line, "Processing %r " % period.label, 50) - period.natural_key = utils.sanitize(period.label) - period.save() - - def backwards(self, orm): - orm.Domain.objects.all().update(natural_key=None) - orm.TimePeriod.objects.all().update(natural_key=None) - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '512', 'unique': 'True', 'null': 'True'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.folder': { - 'Meta': {'object_name': 'Folder'}, - 'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '7168', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '512', 'unique': 'True', 'null': 'True'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] - symmetrical = True diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0014_auto__chg_field_domain_natural_key__chg_field_timeperiod_natural_key.py --- a/src/hdabo/migrations/0014_auto__chg_field_domain_natural_key__chg_field_timeperiod_natural_key.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,222 +0,0 @@ -# -*- coding: utf-8 -*- -from south.db import db -from south.v2 import SchemaMigration - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Domain.natural_key' - db.alter_column(u'hdabo_domain', 'natural_key', self.gf('django.db.models.fields.CharField')(default='_', unique=True, max_length=512)) - - # Changing field 'TimePeriod.natural_key' - db.alter_column(u'hdabo_timeperiod', 'natural_key', self.gf('django.db.models.fields.CharField')(default='_', unique=True, max_length=512)) - - def backwards(self, orm): - - # Changing field 'Domain.natural_key' - db.alter_column(u'hdabo_domain', 'natural_key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=512, null=True)) - - # Changing field 'TimePeriod.natural_key' - db.alter_column(u'hdabo_timeperiod', 'natural_key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=512, null=True)) - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.folder': { - 'Meta': {'object_name': 'Folder'}, - 'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '7168', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0015_sanitize_organisation_hda_id.py --- a/src/hdabo/migrations/0015_sanitize_organisation_hda_id.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,220 +0,0 @@ -# -*- coding: utf-8 -*- -from south.v2 import DataMigration - -from hdabo import utils - - -class Migration(DataMigration): - - def forwards(self, orm): - total_line = orm.Organisation.objects.count() - for i,org in enumerate(orm.Organisation.objects.all()): - utils.show_progress(i+1, total_line, "Processing %r " % org.hda_id, 50) - new_hda_id = utils.sanitize(org.hda_id) - if not orm.Organisation.objects.filter(hda_id=new_hda_id).exists(): - org.hda_id = new_hda_id - org.save() - - def backwards(self, orm): - pass - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.folder': { - 'Meta': {'object_name': 'Folder'}, - 'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '7168', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] - symmetrical = True diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0016_auto__add_field_tagcategory_natural_key.py --- a/src/hdabo/migrations/0016_auto__add_field_tagcategory_natural_key.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,219 +0,0 @@ -# -*- coding: utf-8 -*- -from south.db import db -from south.v2 import SchemaMigration - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'TagCategory.natural_key' - db.add_column(u'hdabo_tagcategory', 'natural_key', - self.gf('django.db.models.fields.CharField')(max_length=512, null=True, blank=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'TagCategory.natural_key' - db.delete_column(u'hdabo_tagcategory', 'natural_key') - - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.folder': { - 'Meta': {'object_name': 'Folder'}, - 'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '7168', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0017_calculate_category_natural_key.py --- a/src/hdabo/migrations/0017_calculate_category_natural_key.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,223 +0,0 @@ -# -*- coding: utf-8 -*- -from south.v2 import DataMigration - -from hdabo import utils - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Don't use "from appname.models import ModelName". - # Use orm.ModelName to refer to models in this application, - # and orm['appname.ModelName'] for models in other applications. - total_line = orm.TagCategory.objects.count() - for i,cat in enumerate(orm.TagCategory.objects.all()): - utils.show_progress(i+1, total_line, "Processing %r " % cat.label, 50) - cat.natural_key = utils.sanitize(cat.label) - cat.save() - - - def backwards(self, orm): - orm.TagCategory.objects.all().update(natural_key=None) - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.folder': { - 'Meta': {'object_name': 'Folder'}, - 'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '7168', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] - symmetrical = True diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/migrations/0018_auto__chg_field_tagcategory_natural_key__add_index_tagcategory_natural.py --- a/src/hdabo/migrations/0018_auto__chg_field_tagcategory_natural_key__add_index_tagcategory_natural.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,225 +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): - - # Changing field 'TagCategory.natural_key' - db.alter_column(u'hdabo_tagcategory', 'natural_key', self.gf('django.db.models.fields.CharField')(default='_', max_length=512)) - # Adding index on 'TagCategory', fields ['natural_key'] - db.create_index(u'hdabo_tagcategory', ['natural_key']) - - - def backwards(self, orm): - # Removing index on 'TagCategory', fields ['natural_key'] - db.delete_index(u'hdabo_tagcategory', ['natural_key']) - - - # Changing field 'TagCategory.natural_key' - db.alter_column(u'hdabo_tagcategory', 'natural_key', self.gf('django.db.models.fields.CharField')(max_length=512, null=True)) - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.folder': { - 'Meta': {'object_name': 'Folder'}, - 'datasheets': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Datasheet']", 'symmetrical': 'False'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048'}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '7168', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - } - } - - complete_apps = ['hdabo'] \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/models.py --- a/src/hdabo/models.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdabo/models.py Tue Mar 24 12:24:28 2015 +0100 @@ -18,8 +18,8 @@ class SortedModelManager(models.Manager): use_for_related_fields = True - def get_query_set(self): - qs = super(SortedModelManager, self).get_query_set() + def get_queryset(self): + qs = super(SortedModelManager, self).get_queryset() if getattr(self, 'through', None) is not None and getattr(self.through, 'Meta', None) is not None and getattr(self.through.Meta, 'ordering', None) is not None: qs = qs.order_by(*[self.through._meta.db_table + "." + f for f in self.through.Meta.ordering]) return qs diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/settings.py --- a/src/hdabo/settings.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdabo/settings.py Tue Mar 24 12:24:28 2015 +0100 @@ -119,7 +119,6 @@ INSTALLED_APPS = ( 'hdabo', - 'south', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -143,6 +142,8 @@ #('zh-tw', ugettext('Chinese')), ) +TEST_RUNNER = 'django.test.runner.DiscoverRunner' + WIKIPEDIA_API_URL = "http://fr.wikipedia.org/w/api.php" WIKIPEDIA_VERSION_PERMALINK_TEMPLATE = "http://fr.wikipedia.org/w/index.php?oldid=%s" DBPEDIA_URI_TEMPLATE = "http://fr.dbpedia.org/%s/%s" diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/tests/__init__.py --- a/src/hdabo/tests/__init__.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdabo/tests/__init__.py Tue Mar 24 12:24:28 2015 +0100 @@ -1,3 +1,3 @@ -from hdabo.tests.models import DatasheetTest +from hdabo.tests.test_models import DatasheetTest #from hdabo.tests.sortedm2mfield import TestSortedFormField, TestSortedManyToManyField, TestStringReference \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/tests/models.py --- a/src/hdabo/tests/models.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- - -from django.test import TestCase -from hdabo.models import Datasheet - - -class DatasheetTest(TestCase): - fixtures = ['datasheet_10'] - - def setUp(self): - self.datasheet_instance = Datasheet.objects.get(hda_id='1608') - - def test_domains_text(self): - domains_text = self.datasheet_instance.domains_text - self.assertEqual(u"Arts du quotidien; Arts du visuel", domains_text) - - def test_domains_list(self): - domains_list = self.datasheet_instance.domains_list - self.assertListEqual([u"Arts du quotidien", u"Arts du visuel"], domains_list) - - def test_tags_text(self): - tags_text = [s.strip() for s in self.datasheet_instance.tags_text.split(";")] - tags_text.sort() - self.assertListEqual(tags_text, [u'XIXe s.', u'XVIIIe s.', u'XVIIe s.', u'XVIe s.', u'affichage', u'affiche', u'afficheur', u'aménagement urbain', u'colonne Morris', u'mobilier urbain', u'ordonnance de François Ier', u'publicité'], "Tags list does not match") diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/tests/test_models.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdabo/tests/test_models.py Tue Mar 24 12:24:28 2015 +0100 @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- + +from django.test import TestCase +from hdabo.models import Datasheet + + +class DatasheetTest(TestCase): + fixtures = ['datasheet_10'] + + def setUp(self): + self.datasheet_instance = Datasheet.objects.get(hda_id='1608') + + def test_domains_text(self): + domains_text = self.datasheet_instance.domains_text + self.assertEqual(u"Arts du quotidien; Arts du visuel", domains_text) + + def test_domains_list(self): + domains_list = self.datasheet_instance.domains_list + self.assertListEqual([u"Arts du quotidien", u"Arts du visuel"], domains_list) + + def test_tags_text(self): + tags_text = [s.strip() for s in self.datasheet_instance.tags_text.split(";")] + tags_text.sort() + self.assertListEqual(tags_text, [u'Affichage', u'Affiche', u'Afficheur', u'Am\xe9nagement urbain', u'Colonne Morris', u'Mobilier urbain', u'Ordonnance de Fran\xe7ois Ier', u'Publicit\xe9', u'XIXe s.', u'XVIIIe s.', u'XVIIe s.', u'XVIe s.'], "Tags list does not match") diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/urls.py --- a/src/hdabo/urls.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdabo/urls.py Tue Mar 24 12:24:28 2015 +0100 @@ -5,9 +5,6 @@ from .views import AddOrUpdateFolder, Folders, SearchDatasheet, DeleteFolder -# Uncomment the next two lines to enable the admin: -admin.autodiscover() - urlpatterns = patterns('', # Examples: # url(r'^$', 'hdabo.views.home', name='home'), diff -r 03d4200ae809 -r 92b01b214192 src/hdabo/views.py --- a/src/hdabo/views.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdabo/views.py Tue Mar 24 12:24:28 2015 +0100 @@ -374,7 +374,7 @@ try: tag.save() except: - return HttpResponseBadRequest(json.dumps({'error': 'duplicate_tag', 'message': u"Le tag %s (%s) existe déjà." % (tag_label, tag.original_label)}), mimetype="application/json") + return HttpResponseBadRequest(json.dumps({'error': 'duplicate_tag', 'message': u"Le tag %s (%s) existe déjà." % (tag_label, tag.original_label)}), content_type="application/json") if old_pageid != pageid: TaggedSheet.objects.filter(tag=tag).update(wikipedia_revision_id=revision_id) @@ -396,7 +396,7 @@ if tag.label != tag_label: if tag_label.lower() in [t.label.lower() for t in ds.tags.all()]: - return HttpResponseBadRequest(json.dumps({'error': 'duplicate_tag', 'message': u"Le tag %s existe déjà pour cette fiche." % (tag_label)}), mimetype="application/json") + return HttpResponseBadRequest(json.dumps({'error': 'duplicate_tag', 'message': u"Le tag %s existe déjà pour cette fiche." % (tag_label)}), content_type="application/json") tag, revision_id, created = get_or_create_tag(tag_label) #@UnusedVariable @@ -436,7 +436,7 @@ try: process_tag(site, tag) except: - return HttpResponseBadRequest(json.dumps({'error': 'duplicate_tag', 'message': u"La version sémantisée du tag %s (%s) existe déjà." % (tag.label, tag.original_label)}), mimetype="application/json") + return HttpResponseBadRequest(json.dumps({'error': 'duplicate_tag', 'message': u"La version sémantisée du tag %s (%s) existe déjà." % (tag.label, tag.original_label)}), content_type="application/json") @@ -454,7 +454,7 @@ ds = Datasheet.objects.get(hda_id=ds_id) if tag_label.lower() in [t.label.lower() for t in ds.tags.all()]: - return HttpResponseBadRequest(json.dumps({'error': 'duplicate_tag', 'message': u"Le tag %s existe déjà pour cette fiche." % (tag_label)}), mimetype="application/json") + return HttpResponseBadRequest(json.dumps({'error': 'duplicate_tag', 'message': u"Le tag %s existe déjà pour cette fiche." % (tag_label)}), content_type="application/json") tag, revision_id, created = get_or_create_tag(tag_label) @@ -491,7 +491,7 @@ else: if Tag.objects.filter(label=tag.label, original_label=tag.original_label, url_status=Tag.TAG_URL_STATUS_DICT['null_result']).count() > 0: - return HttpResponseBadRequest(json.dumps({'error': 'duplicate_tag', 'message': u"La version désémantisée du tag %s (%s) existe déjà." % (tag.label, tag.original_label)}), mimetype="application/json") + return HttpResponseBadRequest(json.dumps({'error': 'duplicate_tag', 'message': u"La version désémantisée du tag %s (%s) existe déjà." % (tag.label, tag.original_label)}), content_type="application/json") tag.wikipedia_url = None tag.wikipedia_pageid = None tag.dbpedia_uri = None diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/__init__.py --- a/src/hdalab/__init__.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/__init__.py Tue Mar 24 12:24:28 2015 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import -VERSION = (3, 0, 0, "rc", 4) +VERSION = (3, 0, 0, "rc", 7) def get_version(): @@ -17,10 +17,6 @@ __version__ = get_version() -try: - from .celery import app as celery_app -except: - pass +default_app_config = 'hdalab.apps.HdalabAppConfig' - diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/apps.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/apps.py Tue Mar 24 12:24:28 2015 +0100 @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +''' +Created on Mar 19, 2015 + +@author: ymh +''' + +from __future__ import absolute_import + +from django.apps import AppConfig + + +class HdalabAppConfig(AppConfig): + + name = "hdalab" + verbose_name = "HdaLab" + + def ready(self): + from .celery import app as celery_app # @UnusedImport + import hdalab.signals # @UnusedImport \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/config.py.tmpl --- a/src/hdalab/config.py.tmpl Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/config.py.tmpl Tue Mar 24 12:24:28 2015 +0100 @@ -57,6 +57,11 @@ # Examples: "http://foo.com/static/admin/", "/static/admin/". ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/' +# Hosts/domain names that are valid for this site; required if DEBUG is False +# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts +ALLOWED_HOSTS = ['localhost', '127.0.0.1'] + + GOOGLE_ANALYTICS_CODE = None LOG_FILE = os.path.abspath(os.path.join(BASE_DIR,"../../run/log/log.txt")) diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/fields.py --- a/src/hdalab/fields.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/fields.py Tue Mar 24 12:24:28 2015 +0100 @@ -10,18 +10,34 @@ from django.core.exceptions import ObjectDoesNotExist from django.db import models from django.db.models import fields as django_fields -from south.modelsinspector import add_introspection_rules +def isalambda(v): + LAMBDA = lambda:0 + return isinstance(v, type(LAMBDA)) and v.__name__ == LAMBDA.__name__ class OneToOneField(models.OneToOneField): - def __init__(self, to, **kwargs): + def __init__(self, *args, **kwargs): self.related_default = kwargs.pop('related_default', None) - super(OneToOneField, self).__init__(to, **kwargs) + #This is BAD. Did this to avoid more work in Django 1.7 migration + #TODO: correct this + if self.related_default == "lambda:": + self.related_default = lambda instance: None + super(OneToOneField, self).__init__(*args, **kwargs) def contribute_to_related_class(self, cls, related): setattr(cls, related.get_accessor_name(), SingleRelatedObjectDescriptor(related, self.related_default)) + def deconstruct(self): + name, path, args, kwargs = super(OneToOneField, self).deconstruct() + if self.related_default is not None: + # this is VERY dirty and works only in our application. + #TODO: correct this... + if isalambda(self.related_default): + kwargs['related_default'] = "lambda:" + else: + kwargs['related_default'] = self.related_default + return name, path, args, kwargs class SingleRelatedObjectDescriptor(django_fields.related.SingleRelatedObjectDescriptor): def __init__(self, related, default): @@ -41,12 +57,3 @@ setattr(value, self.related.field.get_cache_name(), instance) return value -add_introspection_rules([ - ( - [OneToOneField], - [], # Positional arguments (not used) - { # Keyword argument - "related_default": ["related_default", {"default": None, "is_django_function": True}], - }, - ), -], ["^hdalab\.fields\.OneToOneField"]) \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/de/LC_MESSAGES/django.mo Binary file src/hdalab/locale/de/LC_MESSAGES/django.mo has changed diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/de/LC_MESSAGES/django.po --- a/src/hdalab/locale/de/LC_MESSAGES/django.po Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/locale/de/LC_MESSAGES/django.po Tue Mar 24 12:24:28 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 11:28-0500\n" +"POT-Creation-Date: 2015-03-19 09:40-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,22 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" +#: models/renkan.py:32 +msgid "edition_state" +msgstr "" + +#: models/renkan.py:33 +msgid "moderated_state" +msgstr "" + +#: models/renkan.py:34 +msgid "published_state" +msgstr "" + +#: models/renkan.py:35 +msgid "rejected_state" +msgstr "" + #: settings.py:40 msgid "French" msgstr "Französisch" @@ -41,20 +57,20 @@ msgid "Japanese" msgstr "Japanisch" -#: models/renkan.py:32 -msgid "edition_state" +#: templates/400.html:6 templates/400.html.py:15 +msgid "Bad request" msgstr "" -#: models/renkan.py:33 -msgid "moderated_state" +#: templates/400.html:18 +msgid "Sorry, you sent a bad request." msgstr "" -#: models/renkan.py:34 -msgid "published_state" +#: templates/404.html:6 templates/404.html.py:15 +msgid "Page not found" msgstr "" -#: models/renkan.py:35 -msgid "rejected_state" +#: templates/404.html:18 +msgid "Sorry, but the requested page could not be found." msgstr "" #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 @@ -62,6 +78,49 @@ msgid "A Propos" msgstr "" +#: templates/ajax_identification/ajax_login.html:7 +msgid "Identifiants" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:9 +#: templates/registration/login.html:19 +#: templates/registration/password_reset_form.html:19 +msgid "Sorry, that's not a valid username or password." +msgstr "" + +#: templates/ajax_identification/ajax_login.html:15 +#: templates/registration/registration_form.html:25 +msgid "Nom d'utilisateur" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:19 +#: templates/registration/registration_form.html:33 +msgid "Mot de passe" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:23 +msgid "Cancel" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:23 +#: templates/registration/login.html:5 templates/registration/login.html:33 +msgid "Login" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:26 +#: templates/registration/login.html:36 +msgid "Forgot password ?" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:27 +#: templates/registration/login.html:37 +msgid "Still not a user ? Create an account" +msgstr "" + +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:50 +msgid "Log out" +msgstr "" + #: templates/base.html:38 msgid "Accueil" msgstr "" @@ -78,10 +137,6 @@ msgid "Thésaurus" msgstr "" -#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 -msgid "Log out" -msgstr "" - #: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 @@ -134,6 +189,149 @@ msgid "Credits" msgstr "" +#: templates/editorial/manage_renkans.html:7 +msgid "Manage renkan publication" +msgstr "" + +#: templates/editorial/manage_renkans.html:29 +msgid "Are you sure you want to PUBLISH this renkan ?" +msgstr "" + +#: templates/editorial/manage_renkans.html:30 +msgid "Are you sure you want to UNPUBLISH this renkan ?" +msgstr "" + +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" +msgstr "" + +#: templates/editorial/manage_renkans.html:39 templates/profile_home.html:36 +msgid "Administrer les Renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:41 +#: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 +#: templates/profile_home.html.py:125 templates/renkan_list.html:39 +#: templates/renkan_list.html.py:91 +msgid "Previous" +msgstr "" + +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 +#: templates/profile_home.html.py:126 templates/renkan_list.html:40 +#: templates/renkan_list.html.py:92 +msgid "Next" +msgstr "" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +msgid "Filter" +msgstr "Filter:" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +msgid "Advanced search" +msgstr "" + +#: templates/editorial/manage_renkans.html:45 +#: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 +#: templates/profile_home.html.py:78 templates/renkan_list.html:43 +#: templates/renkan_list.html.py:55 +msgid "Title" +msgstr "" + +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 +#: templates/profile_home.html.py:82 templates/renkan_list.html:44 +#: templates/renkan_list.html.py:63 +msgid "Modification date" +msgstr "" + +#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61 +#: templates/renkan_list.html:44 +msgid "begin" +msgstr "" + +#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62 +#: templates/renkan_list.html:45 +msgid "end" +msgstr "" + +#: templates/editorial/manage_renkans.html:48 +#: templates/registration/login.html:25 templates/renkan_list.html:46 +msgid "Username" +msgstr "" + +#: templates/editorial/manage_renkans.html:49 +#: templates/editorial/manage_renkans.html:72 templates/profile_home.html:63 +#: templates/profile_home.html.py:85 +msgid "State" +msgstr "" + +#: templates/editorial/manage_renkans.html:52 templates/profile_home.html:67 +msgid "Moderated" +msgstr "" + +#: templates/editorial/manage_renkans.html:53 templates/profile_home.html:68 +msgid "Published" +msgstr "" + +#: templates/editorial/manage_renkans.html:54 templates/profile_home.html:69 +msgid "Rejected" +msgstr "" + +#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 +#: templates/renkan_list.html:48 +msgid "Favorite" +msgstr "" + +#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 +#: templates/renkan_list.html:50 +msgid "Search" +msgstr "" + +#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 +#: templates/renkan_list.html:58 +msgid "Fav." +msgstr "" + +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61 +msgid "User" +msgstr "" + +#: templates/editorial/manage_renkans.html:71 templates/profile_home.html:84 +msgid "Preview" +msgstr "" + +#: templates/editorial/manage_renkans.html:74 templates/profile_home.html:87 +msgid "Actions" +msgstr "" + +#: templates/editorial/manage_renkans.html:93 templates/profile_home.html:116 +msgid "publish renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:94 templates/profile_home.html:117 +msgid "unpublish renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:95 +msgid "reject renkan" +msgstr "" + +#: templates/envelope/contact.html:19 +msgid "" +"\n" +"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" +"

Remplissez le formulaire suivant :

\n" +" " +msgstr "" + +#: templates/envelope/contact.html:28 +msgid "Send!" +msgstr "" + #: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Suche nach Facetten" @@ -191,6 +389,29 @@ msgid "Resultats de recherche" msgstr "Suchergebnisse" +#: templates/hdabo/user_update_form.html:6 +msgid "Profile change" +msgstr "" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "" + #: templates/help_popup.html:7 msgid "Fermer
ce didacticiel" msgstr "" @@ -435,10 +656,6 @@ msgid "Adminsitration du Site" msgstr "" -#: templates/profile_home.html:36 -msgid "Administrer les Renkan" -msgstr "" - #: templates/profile_home.html:37 msgid "Editorialisation" msgstr "" @@ -471,99 +688,10 @@ msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:91 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:100 -msgid "Previous" -msgstr "" - -#: templates/profile_home.html:57 templates/profile_home.html.py:126 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:92 -#: templates/editorial/manage_renkans.html:39 -#: templates/editorial/manage_renkans.html:101 -msgid "Next" -msgstr "" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -msgid "Filter" -msgstr "Filter:" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -msgid "Advanced search" -msgstr "" - -#: templates/profile_home.html:60 templates/profile_home.html.py:78 -#: templates/renkan_list.html:43 templates/renkan_list.html.py:55 -#: templates/editorial/manage_renkans.html:42 -#: templates/editorial/manage_renkans.html:60 -msgid "Title" -msgstr "" - -#: templates/profile_home.html:61 templates/profile_home.html.py:82 -#: templates/renkan_list.html:44 templates/renkan_list.html.py:63 -#: templates/editorial/manage_renkans.html:43 -#: templates/editorial/manage_renkans.html:66 -msgid "Modification date" -msgstr "" - -#: templates/profile_home.html:61 templates/renkan_list.html:44 -#: templates/editorial/manage_renkans.html:43 -msgid "begin" -msgstr "" - -#: templates/profile_home.html:62 templates/renkan_list.html:45 -#: templates/editorial/manage_renkans.html:44 -msgid "end" -msgstr "" - -#: templates/profile_home.html:63 templates/profile_home.html.py:85 -#: templates/editorial/manage_renkans.html:46 -#: templates/editorial/manage_renkans.html:69 -msgid "State" -msgstr "" - #: templates/profile_home.html:66 msgid "Edition" msgstr "" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:49 -msgid "Moderated" -msgstr "" - -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:50 -msgid "Published" -msgstr "" - -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:51 -msgid "Rejected" -msgstr "" - -#: templates/profile_home.html:72 templates/renkan_list.html:48 -#: templates/editorial/manage_renkans.html:54 -msgid "Favorite" -msgstr "" - -#: templates/profile_home.html:73 templates/renkan_list.html:50 -#: templates/editorial/manage_renkans.html:55 -msgid "Search" -msgstr "" - -#: templates/profile_home.html:80 templates/renkan_list.html:58 -#: templates/editorial/manage_renkans.html:62 -msgid "Fav." -msgstr "" - -#: templates/profile_home.html:84 templates/editorial/manage_renkans.html:68 -msgid "Preview" -msgstr "" - -#: templates/profile_home.html:87 templates/editorial/manage_renkans.html:71 -msgid "Actions" -msgstr "" - #: templates/profile_home.html:106 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "" @@ -577,157 +705,14 @@ "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:90 -msgid "publish renkan" -msgstr "" - #: templates/profile_home.html:116 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:117 templates/editorial/manage_renkans.html:91 -msgid "unpublish renkan" -msgstr "" - #: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" -#: templates/renkan_edit.html:66 -msgid "Ressources" -msgstr "" - -#: templates/renkan_edit.html:197 -msgid "Change organisation" -msgstr "" - -#: templates/renkan_edit.html:198 -msgid "(Indisponible si modification du RENKAN)" -msgstr "" - -#: templates/renkan_edit.html:201 templates/renkan_edit.html.py:205 -#: templates/renkan_edit.html:209 -msgid "View graph in column" -msgstr "" - -#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 -#: templates/renkan_edit.html:210 -msgid "View graph in line" -msgstr "" - -#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 -#: templates/renkan_edit.html:211 -msgid "View graph in circle" -msgstr "" - -#: templates/renkan_list.html:6 views/profile.py:143 -msgid "Marked Renkans list" -msgstr "" - -#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:25 -msgid "Username" -msgstr "" - -#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 -msgid "User" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:7 -msgid "Identifiants" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:19 -#: templates/registration/password_reset_form.html:18 -msgid "Sorry, that's not a valid username or password." -msgstr "" - -#: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:25 -msgid "Nom d'utilisateur" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:33 -msgid "Mot de passe" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:23 -msgid "Cancel" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:23 -#: templates/registration/login.html:5 templates/registration/login.html:33 -msgid "Login" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:36 -msgid "Forgot password ?" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:37 -msgid "Still not a user ? Create an account" -msgstr "" - -#: templates/editorial/manage_renkans.html:7 -msgid "Manage renkan publication" -msgstr "" - -#: templates/editorial/manage_renkans.html:29 -msgid "Are you sure you want to PUBLISH this renkan ?" -msgstr "" - -#: templates/editorial/manage_renkans.html:30 -msgid "Are you sure you want to UNPUBLISH this renkan ?" -msgstr "" - -#: templates/editorial/manage_renkans.html:31 -msgid "Are you sure you want to REJECT this renkan ?" -msgstr "" - -#: templates/editorial/manage_renkans.html:92 -msgid "reject renkan" -msgstr "" - -#: templates/envelope/contact.html:19 -msgid "" -"\n" -"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" -"

Remplissez le formulaire suivant :

\n" -" " -msgstr "" - -#: templates/envelope/contact.html:28 -msgid "Send!" -msgstr "" - -#: templates/hdabo/user_update_form.html:6 -msgid "Profile change" -msgstr "" - -#: templates/hdabo/user_update_form.html:15 -msgid "Change user profile" -msgstr "" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Precedent" -msgstr "" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Submit" -msgstr "" - #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "" @@ -794,19 +779,19 @@ msgid "Password change" msgstr "" -#: templates/registration/password_change_form.html:14 +#: templates/registration/password_change_form.html:15 msgid "Changer le mot de passe" msgstr "" -#: templates/registration/password_change_form.html:18 +#: templates/registration/password_change_form.html:19 msgid "Ancien mot de passe" msgstr "" -#: templates/registration/password_change_form.html:22 +#: templates/registration/password_change_form.html:23 msgid "Nouveau mot de passe" msgstr "" -#: templates/registration/password_change_form.html:26 +#: templates/registration/password_change_form.html:27 msgid "Nouveau mot de passe (Verification)" msgstr "" @@ -838,11 +823,11 @@ msgid "Password reset" msgstr "" -#: templates/registration/password_reset_form.html:16 +#: templates/registration/password_reset_form.html:17 msgid "Recuperation du Mot de Passe" msgstr "" -#: templates/registration/password_reset_form.html:23 +#: templates/registration/password_reset_form.html:24 msgid "Email du compte:" msgstr "" @@ -870,6 +855,37 @@ msgid "Mot de passe (Verification)" msgstr "" +#: templates/renkan_edit.html:67 +msgid "Ressources" +msgstr "" + +#: templates/renkan_edit.html:198 +msgid "Change organisation" +msgstr "" + +#: templates/renkan_edit.html:199 +msgid "(Indisponible si modification du RENKAN)" +msgstr "" + +#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 +#: templates/renkan_edit.html:210 +msgid "View graph in column" +msgstr "" + +#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 +#: templates/renkan_edit.html:211 +msgid "View graph in line" +msgstr "" + +#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208 +#: templates/renkan_edit.html:212 +msgid "View graph in circle" +msgstr "" + +#: templates/renkan_list.html:6 views/profile.py:143 +msgid "Marked Renkans list" +msgstr "" + #: views/profile.py:131 msgid "Public Renkans list" msgstr "" diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/en/LC_MESSAGES/django.mo Binary file src/hdalab/locale/en/LC_MESSAGES/django.mo has changed diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/en/LC_MESSAGES/django.po --- a/src/hdalab/locale/en/LC_MESSAGES/django.po Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/locale/en/LC_MESSAGES/django.po Tue Mar 24 12:24:28 2015 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 11:28-0500\n" +"POT-Creation-Date: 2015-03-19 09:40-0500\n" "PO-Revision-Date: 2012-03-09 02:10+0200\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: IRI\n" @@ -17,6 +17,22 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Virtaal 0.7.0-mac-beta-1\n" +#: models/renkan.py:32 +msgid "edition_state" +msgstr "edition" + +#: models/renkan.py:33 +msgid "moderated_state" +msgstr "moderated" + +#: models/renkan.py:34 +msgid "published_state" +msgstr "published" + +#: models/renkan.py:35 +msgid "rejected_state" +msgstr "rejected" + #: settings.py:40 msgid "French" msgstr "French" @@ -41,27 +57,70 @@ msgid "Japanese" msgstr "Japanese" -#: models/renkan.py:32 -msgid "edition_state" -msgstr "edition" +#: templates/400.html:6 templates/400.html.py:15 +msgid "Bad request" +msgstr "Bad request" -#: models/renkan.py:33 -msgid "moderated_state" -msgstr "moderated" +#: templates/400.html:18 +msgid "Sorry, you sent a bad request." +msgstr "Sorry, you sent a bad request." -#: models/renkan.py:34 -msgid "published_state" -msgstr "published" +#: templates/404.html:6 templates/404.html.py:15 +msgid "Page not found" +msgstr "Page not found" -#: models/renkan.py:35 -msgid "rejected_state" -msgstr "rejected" +#: templates/404.html:18 +msgid "Sorry, but the requested page could not be found." +msgstr "Sorry, but the requested page could not be found." #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 #: templates/base.html:97 msgid "A Propos" msgstr "About" +#: templates/ajax_identification/ajax_login.html:7 +msgid "Identifiants" +msgstr "Identifiers" + +#: templates/ajax_identification/ajax_login.html:9 +#: templates/registration/login.html:19 +#: templates/registration/password_reset_form.html:19 +msgid "Sorry, that's not a valid username or password." +msgstr "Sorry, that's not a valid username or password." + +#: templates/ajax_identification/ajax_login.html:15 +#: templates/registration/registration_form.html:25 +msgid "Nom d'utilisateur" +msgstr "Username" + +#: templates/ajax_identification/ajax_login.html:19 +#: templates/registration/registration_form.html:33 +msgid "Mot de passe" +msgstr "Password" + +#: templates/ajax_identification/ajax_login.html:23 +msgid "Cancel" +msgstr "Cancel" + +#: templates/ajax_identification/ajax_login.html:23 +#: templates/registration/login.html:5 templates/registration/login.html:33 +msgid "Login" +msgstr "Login" + +#: templates/ajax_identification/ajax_login.html:26 +#: templates/registration/login.html:36 +msgid "Forgot password ?" +msgstr "Forgot password?" + +#: templates/ajax_identification/ajax_login.html:27 +#: templates/registration/login.html:37 +msgid "Still not a user ? Create an account" +msgstr "Still not a user? Create an account" + +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:50 +msgid "Log out" +msgstr "Log out" + #: templates/base.html:38 msgid "Accueil" msgstr "Home" @@ -78,10 +137,6 @@ msgid "Thésaurus" msgstr "Thesaurus" -#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 -msgid "Log out" -msgstr "Log out" - #: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 @@ -133,6 +188,153 @@ msgid "Credits" msgstr "Credits" +#: templates/editorial/manage_renkans.html:7 +msgid "Manage renkan publication" +msgstr "Manage renkan publication" + +#: templates/editorial/manage_renkans.html:29 +msgid "Are you sure you want to PUBLISH this renkan ?" +msgstr "Are you sure you want to PUBLISH this renkan?" + +#: templates/editorial/manage_renkans.html:30 +msgid "Are you sure you want to UNPUBLISH this renkan ?" +msgstr "Are you sure you want to UNPUBLISH this renkan?" + +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" +msgstr "Are you sure you want to REJECT this renkan?" + +#: templates/editorial/manage_renkans.html:39 templates/profile_home.html:36 +msgid "Administrer les Renkan" +msgstr "Renkan administration" + +#: templates/editorial/manage_renkans.html:41 +#: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 +#: templates/profile_home.html.py:125 templates/renkan_list.html:39 +#: templates/renkan_list.html.py:91 +msgid "Previous" +msgstr "Previous" + +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 +#: templates/profile_home.html.py:126 templates/renkan_list.html:40 +#: templates/renkan_list.html.py:92 +msgid "Next" +msgstr "Next" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +msgid "Filter" +msgstr "Filter" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +msgid "Advanced search" +msgstr "Advanced search" + +#: templates/editorial/manage_renkans.html:45 +#: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 +#: templates/profile_home.html.py:78 templates/renkan_list.html:43 +#: templates/renkan_list.html.py:55 +msgid "Title" +msgstr "Title" + +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 +#: templates/profile_home.html.py:82 templates/renkan_list.html:44 +#: templates/renkan_list.html.py:63 +msgid "Modification date" +msgstr "Modification date" + +#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61 +#: templates/renkan_list.html:44 +msgid "begin" +msgstr "Begin" + +#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62 +#: templates/renkan_list.html:45 +msgid "end" +msgstr "End" + +#: templates/editorial/manage_renkans.html:48 +#: templates/registration/login.html:25 templates/renkan_list.html:46 +msgid "Username" +msgstr "Username" + +#: templates/editorial/manage_renkans.html:49 +#: templates/editorial/manage_renkans.html:72 templates/profile_home.html:63 +#: templates/profile_home.html.py:85 +msgid "State" +msgstr "State" + +#: templates/editorial/manage_renkans.html:52 templates/profile_home.html:67 +msgid "Moderated" +msgstr "Moderated" + +#: templates/editorial/manage_renkans.html:53 templates/profile_home.html:68 +msgid "Published" +msgstr "Published" + +#: templates/editorial/manage_renkans.html:54 templates/profile_home.html:69 +msgid "Rejected" +msgstr "Rejected" + +#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 +#: templates/renkan_list.html:48 +msgid "Favorite" +msgstr "Favorite" + +#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 +#: templates/renkan_list.html:50 +msgid "Search" +msgstr "Search" + +#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 +#: templates/renkan_list.html:58 +msgid "Fav." +msgstr "Fav." + +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61 +msgid "User" +msgstr "User" + +#: templates/editorial/manage_renkans.html:71 templates/profile_home.html:84 +msgid "Preview" +msgstr "Preview" + +#: templates/editorial/manage_renkans.html:74 templates/profile_home.html:87 +msgid "Actions" +msgstr "Actions" + +#: templates/editorial/manage_renkans.html:93 templates/profile_home.html:116 +msgid "publish renkan" +msgstr "publish renkan" + +#: templates/editorial/manage_renkans.html:94 templates/profile_home.html:117 +msgid "unpublish renkan" +msgstr "unpublish renkan" + +#: templates/editorial/manage_renkans.html:95 +msgid "reject renkan" +msgstr "reject Renkan" + +#: templates/envelope/contact.html:19 +msgid "" +"\n" +"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" +"

Remplissez le formulaire suivant :

\n" +" " +msgstr "" +"\n" +"

You wish to ask something about Histoire des arts' Lab ?

\n" +"

Fill the following form:

\n" +" " + +#: templates/envelope/contact.html:28 +msgid "Send!" +msgstr "Send!" + #: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Faceted search" @@ -189,6 +391,29 @@ msgid "Resultats de recherche" msgstr "Search results" +#: templates/hdabo/user_update_form.html:6 +msgid "Profile change" +msgstr "Profile change" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "Previous" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "Submit" + #: templates/help_popup.html:7 msgid "Fermer
ce didacticiel" msgstr "Close
this help" @@ -487,10 +712,6 @@ msgid "Adminsitration du Site" msgstr "Site administration" -#: templates/profile_home.html:36 -msgid "Administrer les Renkan" -msgstr "Renkan administration" - #: templates/profile_home.html:37 msgid "Editorialisation" msgstr "Editorialisation" @@ -508,14 +729,12 @@ msgstr "Modify my profile" #: templates/profile_home.html:46 -#, fuzzy msgid "Modification du mot de passe" -msgstr "Password recovery" +msgstr "Password modification" #: templates/profile_home.html:47 -#, fuzzy msgid "Modification des informations du compte" -msgstr "Modification date" +msgstr "Account modification" #: templates/profile_home.html:51 msgid "Gerer mes Renkan" @@ -525,99 +744,10 @@ msgid "Nouveau Renkan" msgstr "New renkan" -#: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:91 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:100 -msgid "Previous" -msgstr "Previous" - -#: templates/profile_home.html:57 templates/profile_home.html.py:126 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:92 -#: templates/editorial/manage_renkans.html:39 -#: templates/editorial/manage_renkans.html:101 -msgid "Next" -msgstr "Next" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -msgid "Filter" -msgstr "Filter" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -msgid "Advanced search" -msgstr "Advanced search" - -#: templates/profile_home.html:60 templates/profile_home.html.py:78 -#: templates/renkan_list.html:43 templates/renkan_list.html.py:55 -#: templates/editorial/manage_renkans.html:42 -#: templates/editorial/manage_renkans.html:60 -msgid "Title" -msgstr "Title" - -#: templates/profile_home.html:61 templates/profile_home.html.py:82 -#: templates/renkan_list.html:44 templates/renkan_list.html.py:63 -#: templates/editorial/manage_renkans.html:43 -#: templates/editorial/manage_renkans.html:66 -msgid "Modification date" -msgstr "Modification date" - -#: templates/profile_home.html:61 templates/renkan_list.html:44 -#: templates/editorial/manage_renkans.html:43 -msgid "begin" -msgstr "Begin" - -#: templates/profile_home.html:62 templates/renkan_list.html:45 -#: templates/editorial/manage_renkans.html:44 -msgid "end" -msgstr "End" - -#: templates/profile_home.html:63 templates/profile_home.html.py:85 -#: templates/editorial/manage_renkans.html:46 -#: templates/editorial/manage_renkans.html:69 -msgid "State" -msgstr "State" - #: templates/profile_home.html:66 msgid "Edition" msgstr "Edition" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:49 -msgid "Moderated" -msgstr "Moderated" - -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:50 -msgid "Published" -msgstr "Published" - -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:51 -msgid "Rejected" -msgstr "Rejected" - -#: templates/profile_home.html:72 templates/renkan_list.html:48 -#: templates/editorial/manage_renkans.html:54 -msgid "Favorite" -msgstr "Favorite" - -#: templates/profile_home.html:73 templates/renkan_list.html:50 -#: templates/editorial/manage_renkans.html:55 -msgid "Search" -msgstr "Search" - -#: templates/profile_home.html:80 templates/renkan_list.html:58 -#: templates/editorial/manage_renkans.html:62 -msgid "Fav." -msgstr "Fav." - -#: templates/profile_home.html:84 templates/editorial/manage_renkans.html:68 -msgid "Preview" -msgstr "Preview" - -#: templates/profile_home.html:87 templates/editorial/manage_renkans.html:71 -msgid "Actions" -msgstr "Actions" - #: templates/profile_home.html:106 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "Are you sure you want to copy this renkan ?" @@ -632,162 +762,14 @@ msgstr "" "Are you sure you want to delete this renkan ? You cannot undo this action." -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:90 -msgid "publish renkan" -msgstr "publish renkan" - #: templates/profile_home.html:116 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "Are you sure you want to ask to publish this renkan ?" -#: templates/profile_home.html:117 templates/editorial/manage_renkans.html:91 -msgid "unpublish renkan" -msgstr "unpublish renkan" - #: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "Are you sure you want to ask to unpublish this renkan ?" -#: templates/renkan_edit.html:66 -msgid "Ressources" -msgstr "Resources" - -#: templates/renkan_edit.html:197 -msgid "Change organisation" -msgstr "Change organisation" - -#: templates/renkan_edit.html:198 -msgid "(Indisponible si modification du RENKAN)" -msgstr "(Not allowed if RENKAN has been modified)" - -#: templates/renkan_edit.html:201 templates/renkan_edit.html.py:205 -#: templates/renkan_edit.html:209 -msgid "View graph in column" -msgstr "View graph in column" - -#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 -#: templates/renkan_edit.html:210 -msgid "View graph in line" -msgstr "View graph in line" - -#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 -#: templates/renkan_edit.html:211 -msgid "View graph in circle" -msgstr "View graph in circle" - -#: templates/renkan_list.html:6 views/profile.py:143 -msgid "Marked Renkans list" -msgstr "Marked Renkan list" - -#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:25 -msgid "Username" -msgstr "Username" - -#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 -msgid "User" -msgstr "User" - -#: templates/ajax_identification/ajax_login.html:7 -msgid "Identifiants" -msgstr "Identifiers" - -#: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:19 -#: templates/registration/password_reset_form.html:18 -msgid "Sorry, that's not a valid username or password." -msgstr "Sorry, that's not a valid username or password." - -#: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:25 -msgid "Nom d'utilisateur" -msgstr "Username" - -#: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:33 -msgid "Mot de passe" -msgstr "Password" - -#: templates/ajax_identification/ajax_login.html:23 -msgid "Cancel" -msgstr "Cancel" - -#: templates/ajax_identification/ajax_login.html:23 -#: templates/registration/login.html:5 templates/registration/login.html:33 -msgid "Login" -msgstr "Login" - -#: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:36 -msgid "Forgot password ?" -msgstr "Forgot password?" - -#: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:37 -msgid "Still not a user ? Create an account" -msgstr "Still not a user? Create an account" - -#: templates/editorial/manage_renkans.html:7 -msgid "Manage renkan publication" -msgstr "Manage renkan publication" - -#: templates/editorial/manage_renkans.html:29 -msgid "Are you sure you want to PUBLISH this renkan ?" -msgstr "Are you sure you want to PUBLISH this renkan?" - -#: templates/editorial/manage_renkans.html:30 -msgid "Are you sure you want to UNPUBLISH this renkan ?" -msgstr "Are you sure you want to UNPUBLISH this renkan?" - -#: templates/editorial/manage_renkans.html:31 -msgid "Are you sure you want to REJECT this renkan ?" -msgstr "Are you sure you want to REJECT this renkan?" - -#: templates/editorial/manage_renkans.html:92 -msgid "reject renkan" -msgstr "reject Renkan" - -#: templates/envelope/contact.html:19 -msgid "" -"\n" -"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" -"

Remplissez le formulaire suivant :

\n" -" " -msgstr "" -"\n" -"

You wish to ask something about Histoire des arts' Lab ?

\n" -"

Fill the following form:

\n" -" " - -#: templates/envelope/contact.html:28 -msgid "Send!" -msgstr "Send!" - -#: templates/hdabo/user_update_form.html:6 -#, fuzzy -msgid "Profile change" -msgstr "Password change" - -#: templates/hdabo/user_update_form.html:15 -msgid "Change user profile" -msgstr "" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Precedent" -msgstr "Previous" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Submit" -msgstr "Submit" - #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "Registration - Activated" @@ -857,19 +839,19 @@ msgid "Password change" msgstr "Password change" -#: templates/registration/password_change_form.html:14 +#: templates/registration/password_change_form.html:15 msgid "Changer le mot de passe" msgstr "Change password" -#: templates/registration/password_change_form.html:18 +#: templates/registration/password_change_form.html:19 msgid "Ancien mot de passe" msgstr "Old password" -#: templates/registration/password_change_form.html:22 +#: templates/registration/password_change_form.html:23 msgid "Nouveau mot de passe" msgstr "New password" -#: templates/registration/password_change_form.html:26 +#: templates/registration/password_change_form.html:27 msgid "Nouveau mot de passe (Verification)" msgstr "New password (verification)" @@ -901,11 +883,11 @@ msgid "Password reset" msgstr "Password reset" -#: templates/registration/password_reset_form.html:16 +#: templates/registration/password_reset_form.html:17 msgid "Recuperation du Mot de Passe" msgstr "Password recovery" -#: templates/registration/password_reset_form.html:23 +#: templates/registration/password_reset_form.html:24 msgid "Email du compte:" msgstr "Account email:" @@ -933,6 +915,37 @@ msgid "Mot de passe (Verification)" msgstr "Password (verification)" +#: templates/renkan_edit.html:67 +msgid "Ressources" +msgstr "Resources" + +#: templates/renkan_edit.html:198 +msgid "Change organisation" +msgstr "Change organisation" + +#: templates/renkan_edit.html:199 +msgid "(Indisponible si modification du RENKAN)" +msgstr "(Not allowed if RENKAN has been modified)" + +#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 +#: templates/renkan_edit.html:210 +msgid "View graph in column" +msgstr "View graph in column" + +#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 +#: templates/renkan_edit.html:211 +msgid "View graph in line" +msgstr "View graph in line" + +#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208 +#: templates/renkan_edit.html:212 +msgid "View graph in circle" +msgstr "View graph in circle" + +#: templates/renkan_list.html:6 views/profile.py:143 +msgid "Marked Renkans list" +msgstr "Marked Renkan list" + #: views/profile.py:131 msgid "Public Renkans list" msgstr "Public Renkan list" diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/es/LC_MESSAGES/django.mo Binary file src/hdalab/locale/es/LC_MESSAGES/django.mo has changed diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/es/LC_MESSAGES/django.po --- a/src/hdalab/locale/es/LC_MESSAGES/django.po Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/locale/es/LC_MESSAGES/django.po Tue Mar 24 12:24:28 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 11:28-0500\n" +"POT-Creation-Date: 2015-03-19 09:40-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,22 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" +#: models/renkan.py:32 +msgid "edition_state" +msgstr "estado_edición" + +#: models/renkan.py:33 +msgid "moderated_state" +msgstr "estado_moderado" + +#: models/renkan.py:34 +msgid "published_state" +msgstr "estado_publicado" + +#: models/renkan.py:35 +msgid "rejected_state" +msgstr "estado_rechazado" + #: settings.py:40 msgid "French" msgstr "Francés" @@ -41,27 +57,70 @@ msgid "Japanese" msgstr "Japonés" -#: models/renkan.py:32 -msgid "edition_state" -msgstr "estado_edición" +#: templates/400.html:6 templates/400.html.py:15 +msgid "Bad request" +msgstr "" -#: models/renkan.py:33 -msgid "moderated_state" -msgstr "estado_moderado" +#: templates/400.html:18 +msgid "Sorry, you sent a bad request." +msgstr "" -#: models/renkan.py:34 -msgid "published_state" -msgstr "estado_publicado" +#: templates/404.html:6 templates/404.html.py:15 +msgid "Page not found" +msgstr "página no encontrada" -#: models/renkan.py:35 -msgid "rejected_state" -msgstr "estado_rechazado" +#: templates/404.html:18 +msgid "Sorry, but the requested page could not be found." +msgstr "Lo sentimos, pero la página solicitada no se pudo encontrar." #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 #: templates/base.html:97 msgid "A Propos" msgstr "Acerca de Nosotros" +#: templates/ajax_identification/ajax_login.html:7 +msgid "Identifiants" +msgstr "Datos de usuario" + +#: templates/ajax_identification/ajax_login.html:9 +#: templates/registration/login.html:19 +#: templates/registration/password_reset_form.html:19 +msgid "Sorry, that's not a valid username or password." +msgstr "El usuario o la contraseña no es valido" + +#: templates/ajax_identification/ajax_login.html:15 +#: templates/registration/registration_form.html:25 +msgid "Nom d'utilisateur" +msgstr "Nombre de usuario" + +#: templates/ajax_identification/ajax_login.html:19 +#: templates/registration/registration_form.html:33 +msgid "Mot de passe" +msgstr "Contraseña" + +#: templates/ajax_identification/ajax_login.html:23 +msgid "Cancel" +msgstr "Cancelar" + +#: templates/ajax_identification/ajax_login.html:23 +#: templates/registration/login.html:5 templates/registration/login.html:33 +msgid "Login" +msgstr "Iniciar Sesión" + +#: templates/ajax_identification/ajax_login.html:26 +#: templates/registration/login.html:36 +msgid "Forgot password ?" +msgstr "Contraseña perdida ?" + +#: templates/ajax_identification/ajax_login.html:27 +#: templates/registration/login.html:37 +msgid "Still not a user ? Create an account" +msgstr "No tiene usuario ? Crear una cuenta" + +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:50 +msgid "Log out" +msgstr "Cerrar sesión" + #: templates/base.html:38 msgid "Accueil" msgstr "Inicio" @@ -78,10 +137,6 @@ msgid "Thésaurus" msgstr "Thesaurus" -#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 -msgid "Log out" -msgstr "Cerrar sesión" - #: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 @@ -133,6 +188,153 @@ msgid "Credits" msgstr "Creditos" +#: templates/editorial/manage_renkans.html:7 +msgid "Manage renkan publication" +msgstr "Gestionar la publicación de Renkan" + +#: templates/editorial/manage_renkans.html:29 +msgid "Are you sure you want to PUBLISH this renkan ?" +msgstr "¿ Esta seguro que desea PUBLICAR este Renkan ?" + +#: templates/editorial/manage_renkans.html:30 +msgid "Are you sure you want to UNPUBLISH this renkan ?" +msgstr "¿ Esta seguro que desea RESTRINGIR la publicación de este Renkan ?" + +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" +msgstr "¿ Esta seguro que desea RECHAZAR este Renkan ?" + +#: templates/editorial/manage_renkans.html:39 templates/profile_home.html:36 +msgid "Administrer les Renkan" +msgstr "Administrar los Renkan" + +#: templates/editorial/manage_renkans.html:41 +#: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 +#: templates/profile_home.html.py:125 templates/renkan_list.html:39 +#: templates/renkan_list.html.py:91 +msgid "Previous" +msgstr "Anterior" + +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 +#: templates/profile_home.html.py:126 templates/renkan_list.html:40 +#: templates/renkan_list.html.py:92 +msgid "Next" +msgstr "Siguiente" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +msgid "Filter" +msgstr "Filtro" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +msgid "Advanced search" +msgstr "Búsqueda avanzada" + +#: templates/editorial/manage_renkans.html:45 +#: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 +#: templates/profile_home.html.py:78 templates/renkan_list.html:43 +#: templates/renkan_list.html.py:55 +msgid "Title" +msgstr "Titulo" + +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 +#: templates/profile_home.html.py:82 templates/renkan_list.html:44 +#: templates/renkan_list.html.py:63 +msgid "Modification date" +msgstr "Modificar la fecha" + +#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61 +#: templates/renkan_list.html:44 +msgid "begin" +msgstr "inicio" + +#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62 +#: templates/renkan_list.html:45 +msgid "end" +msgstr "fin" + +#: templates/editorial/manage_renkans.html:48 +#: templates/registration/login.html:25 templates/renkan_list.html:46 +msgid "Username" +msgstr "Nombre de Usuario" + +#: templates/editorial/manage_renkans.html:49 +#: templates/editorial/manage_renkans.html:72 templates/profile_home.html:63 +#: templates/profile_home.html.py:85 +msgid "State" +msgstr "Estado" + +#: templates/editorial/manage_renkans.html:52 templates/profile_home.html:67 +msgid "Moderated" +msgstr "Administrado" + +#: templates/editorial/manage_renkans.html:53 templates/profile_home.html:68 +msgid "Published" +msgstr "Publicado" + +#: templates/editorial/manage_renkans.html:54 templates/profile_home.html:69 +msgid "Rejected" +msgstr "Rechazado" + +#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 +#: templates/renkan_list.html:48 +msgid "Favorite" +msgstr "Favorito" + +#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 +#: templates/renkan_list.html:50 +msgid "Search" +msgstr "Buscar" + +#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 +#: templates/renkan_list.html:58 +msgid "Fav." +msgstr "" + +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61 +msgid "User" +msgstr "Usuario" + +#: templates/editorial/manage_renkans.html:71 templates/profile_home.html:84 +msgid "Preview" +msgstr "Vista previa" + +#: templates/editorial/manage_renkans.html:74 templates/profile_home.html:87 +msgid "Actions" +msgstr "Acciones " + +#: templates/editorial/manage_renkans.html:93 templates/profile_home.html:116 +msgid "publish renkan" +msgstr "publicar un Renkan" + +#: templates/editorial/manage_renkans.html:94 templates/profile_home.html:117 +msgid "unpublish renkan" +msgstr "Renkan no publicados" + +#: templates/editorial/manage_renkans.html:95 +msgid "reject renkan" +msgstr "rechazar un renkan" + +#: templates/envelope/contact.html:19 +msgid "" +"\n" +"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" +"

Remplissez le formulaire suivant :

\n" +" " +msgstr "" +"\n" +"

Quiere preguntar algo a Histoire des arts'Lab ?

\n" +"

Rellena el formulario siguiente :

\n" +" " + +#: templates/envelope/contact.html:28 +msgid "Send!" +msgstr "¡Enviar!" + #: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Búsqueda por facetas" @@ -189,6 +391,30 @@ msgid "Resultats de recherche" msgstr "Resultados de búsqueda" +#: templates/hdabo/user_update_form.html:6 +#, fuzzy +msgid "Profile change" +msgstr "Cambiar la contraseña" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "Volver" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "Entregar" + #: templates/help_popup.html:7 msgid "Fermer
ce didacticiel" msgstr "Cerrar
esta ayuda" @@ -450,10 +676,6 @@ msgid "Adminsitration du Site" msgstr "Administración del Sitio" -#: templates/profile_home.html:36 -msgid "Administrer les Renkan" -msgstr "Administrar los Renkan" - #: templates/profile_home.html:37 msgid "Editorialisation" msgstr "Editorialisación" @@ -488,99 +710,10 @@ msgid "Nouveau Renkan" msgstr "Nuevo Renkan" -#: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:91 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:100 -msgid "Previous" -msgstr "Anterior" - -#: templates/profile_home.html:57 templates/profile_home.html.py:126 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:92 -#: templates/editorial/manage_renkans.html:39 -#: templates/editorial/manage_renkans.html:101 -msgid "Next" -msgstr "Siguiente" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -msgid "Filter" -msgstr "Filtro" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -msgid "Advanced search" -msgstr "Búsqueda avanzada" - -#: templates/profile_home.html:60 templates/profile_home.html.py:78 -#: templates/renkan_list.html:43 templates/renkan_list.html.py:55 -#: templates/editorial/manage_renkans.html:42 -#: templates/editorial/manage_renkans.html:60 -msgid "Title" -msgstr "Titulo" - -#: templates/profile_home.html:61 templates/profile_home.html.py:82 -#: templates/renkan_list.html:44 templates/renkan_list.html.py:63 -#: templates/editorial/manage_renkans.html:43 -#: templates/editorial/manage_renkans.html:66 -msgid "Modification date" -msgstr "Modificar la fecha" - -#: templates/profile_home.html:61 templates/renkan_list.html:44 -#: templates/editorial/manage_renkans.html:43 -msgid "begin" -msgstr "inicio" - -#: templates/profile_home.html:62 templates/renkan_list.html:45 -#: templates/editorial/manage_renkans.html:44 -msgid "end" -msgstr "fin" - -#: templates/profile_home.html:63 templates/profile_home.html.py:85 -#: templates/editorial/manage_renkans.html:46 -#: templates/editorial/manage_renkans.html:69 -msgid "State" -msgstr "Estado" - #: templates/profile_home.html:66 msgid "Edition" msgstr "Edición" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:49 -msgid "Moderated" -msgstr "Administrado" - -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:50 -msgid "Published" -msgstr "Publicado" - -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:51 -msgid "Rejected" -msgstr "Rechazado" - -#: templates/profile_home.html:72 templates/renkan_list.html:48 -#: templates/editorial/manage_renkans.html:54 -msgid "Favorite" -msgstr "Favorito" - -#: templates/profile_home.html:73 templates/renkan_list.html:50 -#: templates/editorial/manage_renkans.html:55 -msgid "Search" -msgstr "Buscar" - -#: templates/profile_home.html:80 templates/renkan_list.html:58 -#: templates/editorial/manage_renkans.html:62 -msgid "Fav." -msgstr "" - -#: templates/profile_home.html:84 templates/editorial/manage_renkans.html:68 -msgid "Preview" -msgstr "Vista previa" - -#: templates/profile_home.html:87 templates/editorial/manage_renkans.html:71 -msgid "Actions" -msgstr "Acciones " - #: templates/profile_home.html:106 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "¿ Esta seguro que desea copiar este Renkan ?" @@ -595,162 +728,14 @@ msgstr "" "¿ Esta seguro que desea borrar este Renkan ? Esta acción es irreversible" -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:90 -msgid "publish renkan" -msgstr "publicar un Renkan" - #: templates/profile_home.html:116 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "¿ Esta seguro que desea pedir la publicación de este Renkan ?" -#: templates/profile_home.html:117 templates/editorial/manage_renkans.html:91 -msgid "unpublish renkan" -msgstr "Renkan no publicados" - #: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "¿ Esta seguro que desea restringir la publicación de este Renkan ?" -#: templates/renkan_edit.html:66 -msgid "Ressources" -msgstr "Recursos" - -#: templates/renkan_edit.html:197 -msgid "Change organisation" -msgstr "Cambiar la organización" - -#: templates/renkan_edit.html:198 -msgid "(Indisponible si modification du RENKAN)" -msgstr "(Indisponible despues de modificar el RENKAN)" - -#: templates/renkan_edit.html:201 templates/renkan_edit.html.py:205 -#: templates/renkan_edit.html:209 -msgid "View graph in column" -msgstr "Vista del gráfico en columnas" - -#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 -#: templates/renkan_edit.html:210 -msgid "View graph in line" -msgstr "Vista del gráfico en lineas" - -#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 -#: templates/renkan_edit.html:211 -msgid "View graph in circle" -msgstr "Vista del gráfico en círculo" - -#: templates/renkan_list.html:6 views/profile.py:143 -msgid "Marked Renkans list" -msgstr "Lista de Renkan marcados" - -#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:25 -msgid "Username" -msgstr "Nombre de Usuario" - -#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 -msgid "User" -msgstr "Usuario" - -#: templates/ajax_identification/ajax_login.html:7 -msgid "Identifiants" -msgstr "Datos de usuario" - -#: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:19 -#: templates/registration/password_reset_form.html:18 -msgid "Sorry, that's not a valid username or password." -msgstr "El usuario o la contraseña no es valido" - -#: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:25 -msgid "Nom d'utilisateur" -msgstr "Nombre de usuario" - -#: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:33 -msgid "Mot de passe" -msgstr "Contraseña" - -#: templates/ajax_identification/ajax_login.html:23 -msgid "Cancel" -msgstr "Cancelar" - -#: templates/ajax_identification/ajax_login.html:23 -#: templates/registration/login.html:5 templates/registration/login.html:33 -msgid "Login" -msgstr "Iniciar Sesión" - -#: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:36 -msgid "Forgot password ?" -msgstr "Contraseña perdida ?" - -#: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:37 -msgid "Still not a user ? Create an account" -msgstr "No tiene usuario ? Crear una cuenta" - -#: templates/editorial/manage_renkans.html:7 -msgid "Manage renkan publication" -msgstr "Gestionar la publicación de Renkan" - -#: templates/editorial/manage_renkans.html:29 -msgid "Are you sure you want to PUBLISH this renkan ?" -msgstr "¿ Esta seguro que desea PUBLICAR este Renkan ?" - -#: templates/editorial/manage_renkans.html:30 -msgid "Are you sure you want to UNPUBLISH this renkan ?" -msgstr "¿ Esta seguro que desea RESTRINGIR la publicación de este Renkan ?" - -#: templates/editorial/manage_renkans.html:31 -msgid "Are you sure you want to REJECT this renkan ?" -msgstr "¿ Esta seguro que desea RECHAZAR este Renkan ?" - -#: templates/editorial/manage_renkans.html:92 -msgid "reject renkan" -msgstr "rechazar un renkan" - -#: templates/envelope/contact.html:19 -msgid "" -"\n" -"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" -"

Remplissez le formulaire suivant :

\n" -" " -msgstr "" -"\n" -"

Quiere preguntar algo a Histoire des arts'Lab ?

\n" -"

Rellena el formulario siguiente :

\n" -" " - -#: templates/envelope/contact.html:28 -msgid "Send!" -msgstr "¡Enviar!" - -#: templates/hdabo/user_update_form.html:6 -#, fuzzy -msgid "Profile change" -msgstr "Cambiar la contraseña" - -#: templates/hdabo/user_update_form.html:15 -msgid "Change user profile" -msgstr "" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Precedent" -msgstr "Volver" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Submit" -msgstr "Entregar" - #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "Inscriptición - Activada" @@ -817,19 +802,19 @@ msgid "Password change" msgstr "Cambiar la contraseña" -#: templates/registration/password_change_form.html:14 +#: templates/registration/password_change_form.html:15 msgid "Changer le mot de passe" msgstr "Cambiar la contraseña" -#: templates/registration/password_change_form.html:18 +#: templates/registration/password_change_form.html:19 msgid "Ancien mot de passe" msgstr "Contraseña anterior" -#: templates/registration/password_change_form.html:22 +#: templates/registration/password_change_form.html:23 msgid "Nouveau mot de passe" msgstr "Nueva contraseña" -#: templates/registration/password_change_form.html:26 +#: templates/registration/password_change_form.html:27 msgid "Nouveau mot de passe (Verification)" msgstr "Nueva contraseña (verificación)" @@ -861,11 +846,11 @@ msgid "Password reset" msgstr "Reiniciar la Contraseña" -#: templates/registration/password_reset_form.html:16 +#: templates/registration/password_reset_form.html:17 msgid "Recuperation du Mot de Passe" msgstr "Recuperación de la contraseña" -#: templates/registration/password_reset_form.html:23 +#: templates/registration/password_reset_form.html:24 msgid "Email du compte:" msgstr "Correo electrónico de la cuenta:" @@ -893,6 +878,37 @@ msgid "Mot de passe (Verification)" msgstr "Contraseña (verificación)" +#: templates/renkan_edit.html:67 +msgid "Ressources" +msgstr "Recursos" + +#: templates/renkan_edit.html:198 +msgid "Change organisation" +msgstr "Cambiar la organización" + +#: templates/renkan_edit.html:199 +msgid "(Indisponible si modification du RENKAN)" +msgstr "(Indisponible despues de modificar el RENKAN)" + +#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 +#: templates/renkan_edit.html:210 +msgid "View graph in column" +msgstr "Vista del gráfico en columnas" + +#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 +#: templates/renkan_edit.html:211 +msgid "View graph in line" +msgstr "Vista del gráfico en lineas" + +#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208 +#: templates/renkan_edit.html:212 +msgid "View graph in circle" +msgstr "Vista del gráfico en círculo" + +#: templates/renkan_list.html:6 views/profile.py:143 +msgid "Marked Renkans list" +msgstr "Lista de Renkan marcados" + #: views/profile.py:131 #, fuzzy msgid "Public Renkans list" diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/fr/LC_MESSAGES/django.mo Binary file src/hdalab/locale/fr/LC_MESSAGES/django.mo has changed diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/fr/LC_MESSAGES/django.po --- a/src/hdalab/locale/fr/LC_MESSAGES/django.po Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/locale/fr/LC_MESSAGES/django.po Tue Mar 24 12:24:28 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 11:28-0500\n" +"POT-Creation-Date: 2015-03-19 09:40-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,22 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" +#: models/renkan.py:32 +msgid "edition_state" +msgstr "édition" + +#: models/renkan.py:33 +msgid "moderated_state" +msgstr "modéré" + +#: models/renkan.py:34 +msgid "published_state" +msgstr "publié" + +#: models/renkan.py:35 +msgid "rejected_state" +msgstr "rejeté" + #: settings.py:40 msgid "French" msgstr "Français" @@ -41,27 +57,71 @@ msgid "Japanese" msgstr "Japonais" -#: models/renkan.py:32 -msgid "edition_state" -msgstr "édition" +#: templates/400.html:6 templates/400.html.py:15 +msgid "Bad request" +msgstr "Requête incorrecte" -#: models/renkan.py:33 -msgid "moderated_state" -msgstr "modéré" +#: templates/400.html:18 +msgid "Sorry, you sent a bad request." +msgstr "Désolé, vous avez envoyé une requête incorrecte." -#: models/renkan.py:34 -msgid "published_state" -msgstr "publié" +#: templates/404.html:6 templates/404.html.py:15 +msgid "Page not found" +msgstr "Cette page n'a pas été trouvée" -#: models/renkan.py:35 -msgid "rejected_state" -msgstr "rejeté" +#: templates/404.html:18 +msgid "Sorry, but the requested page could not be found." +msgstr "Désolé, mais la page demandée n'a pas put être trouvée." #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 #: templates/base.html:97 msgid "A Propos" msgstr "À Propos" +#: templates/ajax_identification/ajax_login.html:7 +msgid "Identifiants" +msgstr "Identifiants" + +#: templates/ajax_identification/ajax_login.html:9 +#: templates/registration/login.html:19 +#: templates/registration/password_reset_form.html:19 +msgid "Sorry, that's not a valid username or password." +msgstr "" +"Désolé, le nom de l'utilisateur ou le mot de passe ne sont pas valides." + +#: templates/ajax_identification/ajax_login.html:15 +#: templates/registration/registration_form.html:25 +msgid "Nom d'utilisateur" +msgstr "Nom d'utilisateur" + +#: templates/ajax_identification/ajax_login.html:19 +#: templates/registration/registration_form.html:33 +msgid "Mot de passe" +msgstr "Mot de passe" + +#: templates/ajax_identification/ajax_login.html:23 +msgid "Cancel" +msgstr "Annuler" + +#: templates/ajax_identification/ajax_login.html:23 +#: templates/registration/login.html:5 templates/registration/login.html:33 +msgid "Login" +msgstr "Connexion" + +#: templates/ajax_identification/ajax_login.html:26 +#: templates/registration/login.html:36 +msgid "Forgot password ?" +msgstr "Mot de passe oublié ?" + +#: templates/ajax_identification/ajax_login.html:27 +#: templates/registration/login.html:37 +msgid "Still not a user ? Create an account" +msgstr "Vous n'avez pas de compte ? Créez un compte" + +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:50 +msgid "Log out" +msgstr "Déconnexion" + #: templates/base.html:38 msgid "Accueil" msgstr "Accueil" @@ -78,10 +138,6 @@ msgid "Thésaurus" msgstr "Thésaurus" -#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 -msgid "Log out" -msgstr "Déconnexion" - #: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 @@ -133,6 +189,154 @@ msgid "Credits" msgstr "Crédits" +#: templates/editorial/manage_renkans.html:7 +msgid "Manage renkan publication" +msgstr "Gérer les publications de Renkan" + +#: templates/editorial/manage_renkans.html:29 +msgid "Are you sure you want to PUBLISH this renkan ?" +msgstr "Êtes-vous certain(e) de vouloir PUBLIER ce Renkan ?" + +#: templates/editorial/manage_renkans.html:30 +msgid "Are you sure you want to UNPUBLISH this renkan ?" +msgstr "Êtes-vous certain(e) de vouloir DÉPUBLIER ce Renkan ?" + +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" +msgstr "Êtes-vous certain(e) de vouloir REJETER ce Renkan ?" + +#: templates/editorial/manage_renkans.html:39 templates/profile_home.html:36 +msgid "Administrer les Renkan" +msgstr "Administrer les Renkan" + +#: templates/editorial/manage_renkans.html:41 +#: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 +#: templates/profile_home.html.py:125 templates/renkan_list.html:39 +#: templates/renkan_list.html.py:91 +msgid "Previous" +msgstr "Précédent" + +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 +#: templates/profile_home.html.py:126 templates/renkan_list.html:40 +#: templates/renkan_list.html.py:92 +msgid "Next" +msgstr "Suivant" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +msgid "Filter" +msgstr "Filtrer" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +msgid "Advanced search" +msgstr "Recherche avancée" + +#: templates/editorial/manage_renkans.html:45 +#: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 +#: templates/profile_home.html.py:78 templates/renkan_list.html:43 +#: templates/renkan_list.html.py:55 +msgid "Title" +msgstr "Titre" + +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 +#: templates/profile_home.html.py:82 templates/renkan_list.html:44 +#: templates/renkan_list.html.py:63 +msgid "Modification date" +msgstr "Date de modification" + +#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61 +#: templates/renkan_list.html:44 +msgid "begin" +msgstr "début" + +#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62 +#: templates/renkan_list.html:45 +msgid "end" +msgstr "fin" + +#: templates/editorial/manage_renkans.html:48 +#: templates/registration/login.html:25 templates/renkan_list.html:46 +msgid "Username" +msgstr "Nom d'utilisateur" + +#: templates/editorial/manage_renkans.html:49 +#: templates/editorial/manage_renkans.html:72 templates/profile_home.html:63 +#: templates/profile_home.html.py:85 +msgid "State" +msgstr "État" + +#: templates/editorial/manage_renkans.html:52 templates/profile_home.html:67 +msgid "Moderated" +msgstr "Modéré" + +#: templates/editorial/manage_renkans.html:53 templates/profile_home.html:68 +msgid "Published" +msgstr "Publié" + +#: templates/editorial/manage_renkans.html:54 templates/profile_home.html:69 +msgid "Rejected" +msgstr "Rejeté" + +#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 +#: templates/renkan_list.html:48 +msgid "Favorite" +msgstr "Favoris" + +#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 +#: templates/renkan_list.html:50 +msgid "Search" +msgstr "Rechercher" + +#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 +#: templates/renkan_list.html:58 +msgid "Fav." +msgstr "Fav." + +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61 +msgid "User" +msgstr "Utilisateur" + +#: templates/editorial/manage_renkans.html:71 templates/profile_home.html:84 +msgid "Preview" +msgstr "Prévisualisation" + +#: templates/editorial/manage_renkans.html:74 templates/profile_home.html:87 +msgid "Actions" +msgstr "Actions" + +#: templates/editorial/manage_renkans.html:93 templates/profile_home.html:116 +msgid "publish renkan" +msgstr "publier renkan" + +#: templates/editorial/manage_renkans.html:94 templates/profile_home.html:117 +msgid "unpublish renkan" +msgstr "dépublier renkan" + +#: templates/editorial/manage_renkans.html:95 +msgid "reject renkan" +msgstr "rejeter Renkan" + +#: templates/envelope/contact.html:19 +msgid "" +"\n" +"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" +"

Remplissez le formulaire suivant :

\n" +" " +msgstr "" +"\n" +"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" +"

Remplissez le formulaire suivant :

\n" +" " + +#: templates/envelope/contact.html:28 +msgid "Send!" +msgstr "Envoyer !" + #: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Recherche par facettes" @@ -189,6 +393,29 @@ msgid "Resultats de recherche" msgstr "Résultats de recherche" +#: templates/hdabo/user_update_form.html:6 +msgid "Profile change" +msgstr "Modifier les innformations du compte" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "Précédent" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "Envoyer" + #: templates/help_popup.html:7 msgid "Fermer
ce didacticiel" msgstr "Fermer
ce didacticiel" @@ -495,10 +722,6 @@ msgid "Adminsitration du Site" msgstr "Adminsitration du Site" -#: templates/profile_home.html:36 -msgid "Administrer les Renkan" -msgstr "Administrer les Renkan" - #: templates/profile_home.html:37 msgid "Editorialisation" msgstr "Éditorialisation" @@ -516,14 +739,12 @@ msgstr "Modifier mon profil" #: templates/profile_home.html:46 -#, fuzzy msgid "Modification du mot de passe" -msgstr "Récupération du mot de passe" +msgstr "Modification du mot de passe" #: templates/profile_home.html:47 -#, fuzzy msgid "Modification des informations du compte" -msgstr "Date de modification" +msgstr "Modification des informations du compte" #: templates/profile_home.html:51 msgid "Gerer mes Renkan" @@ -533,99 +754,10 @@ msgid "Nouveau Renkan" msgstr "Nouveau Renkan" -#: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:91 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:100 -msgid "Previous" -msgstr "Précédent" - -#: templates/profile_home.html:57 templates/profile_home.html.py:126 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:92 -#: templates/editorial/manage_renkans.html:39 -#: templates/editorial/manage_renkans.html:101 -msgid "Next" -msgstr "Suivant" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -msgid "Filter" -msgstr "Filtrer" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -msgid "Advanced search" -msgstr "Recherche avancée" - -#: templates/profile_home.html:60 templates/profile_home.html.py:78 -#: templates/renkan_list.html:43 templates/renkan_list.html.py:55 -#: templates/editorial/manage_renkans.html:42 -#: templates/editorial/manage_renkans.html:60 -msgid "Title" -msgstr "Titre" - -#: templates/profile_home.html:61 templates/profile_home.html.py:82 -#: templates/renkan_list.html:44 templates/renkan_list.html.py:63 -#: templates/editorial/manage_renkans.html:43 -#: templates/editorial/manage_renkans.html:66 -msgid "Modification date" -msgstr "Date de modification" - -#: templates/profile_home.html:61 templates/renkan_list.html:44 -#: templates/editorial/manage_renkans.html:43 -msgid "begin" -msgstr "début" - -#: templates/profile_home.html:62 templates/renkan_list.html:45 -#: templates/editorial/manage_renkans.html:44 -msgid "end" -msgstr "fin" - -#: templates/profile_home.html:63 templates/profile_home.html.py:85 -#: templates/editorial/manage_renkans.html:46 -#: templates/editorial/manage_renkans.html:69 -msgid "State" -msgstr "État" - #: templates/profile_home.html:66 msgid "Edition" msgstr "Édition" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:49 -msgid "Moderated" -msgstr "Modéré" - -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:50 -msgid "Published" -msgstr "Publié" - -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:51 -msgid "Rejected" -msgstr "Rejeté" - -#: templates/profile_home.html:72 templates/renkan_list.html:48 -#: templates/editorial/manage_renkans.html:54 -msgid "Favorite" -msgstr "Favoris" - -#: templates/profile_home.html:73 templates/renkan_list.html:50 -#: templates/editorial/manage_renkans.html:55 -msgid "Search" -msgstr "Rechercher" - -#: templates/profile_home.html:80 templates/renkan_list.html:58 -#: templates/editorial/manage_renkans.html:62 -msgid "Fav." -msgstr "Fav." - -#: templates/profile_home.html:84 templates/editorial/manage_renkans.html:68 -msgid "Preview" -msgstr "Prévisualisation" - -#: templates/profile_home.html:87 templates/editorial/manage_renkans.html:71 -msgid "Actions" -msgstr "Actions" - #: templates/profile_home.html:106 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "Êtes-vous certain(e) de vouloir copier ce Renkan ?" @@ -641,164 +773,14 @@ "Êtes-vous certain(e) de vouloir effacer ce Renkan ? Vous ne pourrez pas " "annuler cette action." -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:90 -msgid "publish renkan" -msgstr "publier renkan" - #: templates/profile_home.html:116 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "Êtes-vous certain(e) de vouloir demander la publication de ce Renkan ?" -#: templates/profile_home.html:117 templates/editorial/manage_renkans.html:91 -msgid "unpublish renkan" -msgstr "dépublier renkan" - #: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "Êtes-vous certain(e) de vouloir dépublier ce Renkan ?" -#: templates/renkan_edit.html:66 -msgid "Ressources" -msgstr "Ressources" - -#: templates/renkan_edit.html:197 -msgid "Change organisation" -msgstr "Changer de disposition" - -#: templates/renkan_edit.html:198 -msgid "(Indisponible si modification du RENKAN)" -msgstr "(Indisponible si le RENKAN est modifié)" - -#: templates/renkan_edit.html:201 templates/renkan_edit.html.py:205 -#: templates/renkan_edit.html:209 -msgid "View graph in column" -msgstr "Voir le graphe en colonne" - -#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 -#: templates/renkan_edit.html:210 -msgid "View graph in line" -msgstr "Voir le graphe en ligne" - -#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 -#: templates/renkan_edit.html:211 -msgid "View graph in circle" -msgstr "Voir le graphe en cercle" - -#: templates/renkan_list.html:6 views/profile.py:143 -msgid "Marked Renkans list" -msgstr "Liste des Renkan repères" - -#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:25 -msgid "Username" -msgstr "Nom d'utilisateur" - -#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 -msgid "User" -msgstr "Utilisateur" - -#: templates/ajax_identification/ajax_login.html:7 -msgid "Identifiants" -msgstr "Identifiants" - -#: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:19 -#: templates/registration/password_reset_form.html:18 -msgid "Sorry, that's not a valid username or password." -msgstr "" -"Désolé, le nom de l'utilisateur ou le mot de passe ne sont pas valides." - -#: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:25 -msgid "Nom d'utilisateur" -msgstr "Nom d'utilisateur" - -#: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:33 -msgid "Mot de passe" -msgstr "Mot de passe" - -#: templates/ajax_identification/ajax_login.html:23 -msgid "Cancel" -msgstr "Annuler" - -#: templates/ajax_identification/ajax_login.html:23 -#: templates/registration/login.html:5 templates/registration/login.html:33 -msgid "Login" -msgstr "Connexion" - -#: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:36 -msgid "Forgot password ?" -msgstr "Mot de passe oublié ?" - -#: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:37 -msgid "Still not a user ? Create an account" -msgstr "Vous n'avez pas de compte ? Créez un compte" - -#: templates/editorial/manage_renkans.html:7 -msgid "Manage renkan publication" -msgstr "Gérer les publications de Renkan" - -#: templates/editorial/manage_renkans.html:29 -msgid "Are you sure you want to PUBLISH this renkan ?" -msgstr "Êtes-vous certain(e) de vouloir PUBLIER ce Renkan ?" - -#: templates/editorial/manage_renkans.html:30 -msgid "Are you sure you want to UNPUBLISH this renkan ?" -msgstr "Êtes-vous certain(e) de vouloir DÉPUBLIER ce Renkan ?" - -#: templates/editorial/manage_renkans.html:31 -msgid "Are you sure you want to REJECT this renkan ?" -msgstr "Êtes-vous certain(e) de vouloir REJETER ce Renkan ?" - -#: templates/editorial/manage_renkans.html:92 -msgid "reject renkan" -msgstr "rejeter Renkan" - -#: templates/envelope/contact.html:19 -msgid "" -"\n" -"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" -"

Remplissez le formulaire suivant :

\n" -" " -msgstr "" -"\n" -"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" -"

Remplissez le formulaire suivant :

\n" -" " - -#: templates/envelope/contact.html:28 -msgid "Send!" -msgstr "Envoyer !" - -#: templates/hdabo/user_update_form.html:6 -#, fuzzy -msgid "Profile change" -msgstr "Modifier le mot de passe" - -#: templates/hdabo/user_update_form.html:15 -msgid "Change user profile" -msgstr "" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Precedent" -msgstr "Précédent" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Submit" -msgstr "Envoyer" - #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "Enregistrement - Activé" @@ -868,19 +850,19 @@ msgid "Password change" msgstr "Modifier le mot de passe" -#: templates/registration/password_change_form.html:14 +#: templates/registration/password_change_form.html:15 msgid "Changer le mot de passe" msgstr "Changer le mot de passe" -#: templates/registration/password_change_form.html:18 +#: templates/registration/password_change_form.html:19 msgid "Ancien mot de passe" msgstr "Ancien mot de passe" -#: templates/registration/password_change_form.html:22 +#: templates/registration/password_change_form.html:23 msgid "Nouveau mot de passe" msgstr "Nouveau mot de passe" -#: templates/registration/password_change_form.html:26 +#: templates/registration/password_change_form.html:27 msgid "Nouveau mot de passe (Verification)" msgstr "Nouveau mot de passe (Verification)" @@ -914,11 +896,11 @@ msgid "Password reset" msgstr "Réinitialisation du mot de passe" -#: templates/registration/password_reset_form.html:16 +#: templates/registration/password_reset_form.html:17 msgid "Recuperation du Mot de Passe" msgstr "Récupération du mot de passe" -#: templates/registration/password_reset_form.html:23 +#: templates/registration/password_reset_form.html:24 msgid "Email du compte:" msgstr "Email du compte :" @@ -946,6 +928,37 @@ msgid "Mot de passe (Verification)" msgstr "Mot de passe (vérification)" +#: templates/renkan_edit.html:67 +msgid "Ressources" +msgstr "Ressources" + +#: templates/renkan_edit.html:198 +msgid "Change organisation" +msgstr "Changer de disposition" + +#: templates/renkan_edit.html:199 +msgid "(Indisponible si modification du RENKAN)" +msgstr "(Indisponible si le RENKAN est modifié)" + +#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 +#: templates/renkan_edit.html:210 +msgid "View graph in column" +msgstr "Voir le graphe en colonne" + +#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 +#: templates/renkan_edit.html:211 +msgid "View graph in line" +msgstr "Voir le graphe en ligne" + +#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208 +#: templates/renkan_edit.html:212 +msgid "View graph in circle" +msgstr "Voir le graphe en cercle" + +#: templates/renkan_list.html:6 views/profile.py:143 +msgid "Marked Renkans list" +msgstr "Liste des Renkan repères" + #: views/profile.py:131 msgid "Public Renkans list" msgstr "Liste des Renkan publics" diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/it/LC_MESSAGES/django.mo Binary file src/hdalab/locale/it/LC_MESSAGES/django.mo has changed diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/it/LC_MESSAGES/django.po --- a/src/hdalab/locale/it/LC_MESSAGES/django.po Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/locale/it/LC_MESSAGES/django.po Tue Mar 24 12:24:28 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 11:28-0500\n" +"POT-Creation-Date: 2015-03-19 09:40-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,22 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" +#: models/renkan.py:32 +msgid "edition_state" +msgstr "" + +#: models/renkan.py:33 +msgid "moderated_state" +msgstr "" + +#: models/renkan.py:34 +msgid "published_state" +msgstr "" + +#: models/renkan.py:35 +msgid "rejected_state" +msgstr "" + #: settings.py:40 msgid "French" msgstr "Francese" @@ -41,20 +57,20 @@ msgid "Japanese" msgstr "Giapponese" -#: models/renkan.py:32 -msgid "edition_state" +#: templates/400.html:6 templates/400.html.py:15 +msgid "Bad request" msgstr "" -#: models/renkan.py:33 -msgid "moderated_state" +#: templates/400.html:18 +msgid "Sorry, you sent a bad request." msgstr "" -#: models/renkan.py:34 -msgid "published_state" +#: templates/404.html:6 templates/404.html.py:15 +msgid "Page not found" msgstr "" -#: models/renkan.py:35 -msgid "rejected_state" +#: templates/404.html:18 +msgid "Sorry, but the requested page could not be found." msgstr "" #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 @@ -62,6 +78,49 @@ msgid "A Propos" msgstr "" +#: templates/ajax_identification/ajax_login.html:7 +msgid "Identifiants" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:9 +#: templates/registration/login.html:19 +#: templates/registration/password_reset_form.html:19 +msgid "Sorry, that's not a valid username or password." +msgstr "" + +#: templates/ajax_identification/ajax_login.html:15 +#: templates/registration/registration_form.html:25 +msgid "Nom d'utilisateur" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:19 +#: templates/registration/registration_form.html:33 +msgid "Mot de passe" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:23 +msgid "Cancel" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:23 +#: templates/registration/login.html:5 templates/registration/login.html:33 +msgid "Login" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:26 +#: templates/registration/login.html:36 +msgid "Forgot password ?" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:27 +#: templates/registration/login.html:37 +msgid "Still not a user ? Create an account" +msgstr "" + +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:50 +msgid "Log out" +msgstr "" + #: templates/base.html:38 msgid "Accueil" msgstr "" @@ -80,10 +139,6 @@ msgid "Thésaurus" msgstr "" -#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 -msgid "Log out" -msgstr "" - #: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 @@ -138,6 +193,150 @@ msgid "Credits" msgstr "" +#: templates/editorial/manage_renkans.html:7 +msgid "Manage renkan publication" +msgstr "" + +#: templates/editorial/manage_renkans.html:29 +msgid "Are you sure you want to PUBLISH this renkan ?" +msgstr "" + +#: templates/editorial/manage_renkans.html:30 +msgid "Are you sure you want to UNPUBLISH this renkan ?" +msgstr "" + +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" +msgstr "" + +#: templates/editorial/manage_renkans.html:39 templates/profile_home.html:36 +msgid "Administrer les Renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:41 +#: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 +#: templates/profile_home.html.py:125 templates/renkan_list.html:39 +#: templates/renkan_list.html.py:91 +msgid "Previous" +msgstr "" + +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 +#: templates/profile_home.html.py:126 templates/renkan_list.html:40 +#: templates/renkan_list.html.py:92 +msgid "Next" +msgstr "" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +#, fuzzy +msgid "Filter" +msgstr "Filtri:" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +msgid "Advanced search" +msgstr "" + +#: templates/editorial/manage_renkans.html:45 +#: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 +#: templates/profile_home.html.py:78 templates/renkan_list.html:43 +#: templates/renkan_list.html.py:55 +msgid "Title" +msgstr "" + +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 +#: templates/profile_home.html.py:82 templates/renkan_list.html:44 +#: templates/renkan_list.html.py:63 +msgid "Modification date" +msgstr "" + +#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61 +#: templates/renkan_list.html:44 +msgid "begin" +msgstr "" + +#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62 +#: templates/renkan_list.html:45 +msgid "end" +msgstr "" + +#: templates/editorial/manage_renkans.html:48 +#: templates/registration/login.html:25 templates/renkan_list.html:46 +msgid "Username" +msgstr "" + +#: templates/editorial/manage_renkans.html:49 +#: templates/editorial/manage_renkans.html:72 templates/profile_home.html:63 +#: templates/profile_home.html.py:85 +msgid "State" +msgstr "" + +#: templates/editorial/manage_renkans.html:52 templates/profile_home.html:67 +msgid "Moderated" +msgstr "" + +#: templates/editorial/manage_renkans.html:53 templates/profile_home.html:68 +msgid "Published" +msgstr "" + +#: templates/editorial/manage_renkans.html:54 templates/profile_home.html:69 +msgid "Rejected" +msgstr "" + +#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 +#: templates/renkan_list.html:48 +msgid "Favorite" +msgstr "" + +#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 +#: templates/renkan_list.html:50 +msgid "Search" +msgstr "" + +#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 +#: templates/renkan_list.html:58 +msgid "Fav." +msgstr "" + +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61 +msgid "User" +msgstr "" + +#: templates/editorial/manage_renkans.html:71 templates/profile_home.html:84 +msgid "Preview" +msgstr "" + +#: templates/editorial/manage_renkans.html:74 templates/profile_home.html:87 +msgid "Actions" +msgstr "" + +#: templates/editorial/manage_renkans.html:93 templates/profile_home.html:116 +msgid "publish renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:94 templates/profile_home.html:117 +msgid "unpublish renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:95 +msgid "reject renkan" +msgstr "" + +#: templates/envelope/contact.html:19 +msgid "" +"\n" +"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" +"

Remplissez le formulaire suivant :

\n" +" " +msgstr "" + +#: templates/envelope/contact.html:28 +msgid "Send!" +msgstr "" + #: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Ricerca per campo" @@ -196,6 +395,29 @@ msgid "Resultats de recherche" msgstr "Risultati della ricerca" +#: templates/hdabo/user_update_form.html:6 +msgid "Profile change" +msgstr "" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "" + #: templates/help_popup.html:7 msgid "Fermer
ce didacticiel" msgstr "" @@ -440,10 +662,6 @@ msgid "Adminsitration du Site" msgstr "" -#: templates/profile_home.html:36 -msgid "Administrer les Renkan" -msgstr "" - #: templates/profile_home.html:37 msgid "Editorialisation" msgstr "" @@ -476,100 +694,10 @@ msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:91 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:100 -msgid "Previous" -msgstr "" - -#: templates/profile_home.html:57 templates/profile_home.html.py:126 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:92 -#: templates/editorial/manage_renkans.html:39 -#: templates/editorial/manage_renkans.html:101 -msgid "Next" -msgstr "" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -#, fuzzy -msgid "Filter" -msgstr "Filtri:" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -msgid "Advanced search" -msgstr "" - -#: templates/profile_home.html:60 templates/profile_home.html.py:78 -#: templates/renkan_list.html:43 templates/renkan_list.html.py:55 -#: templates/editorial/manage_renkans.html:42 -#: templates/editorial/manage_renkans.html:60 -msgid "Title" -msgstr "" - -#: templates/profile_home.html:61 templates/profile_home.html.py:82 -#: templates/renkan_list.html:44 templates/renkan_list.html.py:63 -#: templates/editorial/manage_renkans.html:43 -#: templates/editorial/manage_renkans.html:66 -msgid "Modification date" -msgstr "" - -#: templates/profile_home.html:61 templates/renkan_list.html:44 -#: templates/editorial/manage_renkans.html:43 -msgid "begin" -msgstr "" - -#: templates/profile_home.html:62 templates/renkan_list.html:45 -#: templates/editorial/manage_renkans.html:44 -msgid "end" -msgstr "" - -#: templates/profile_home.html:63 templates/profile_home.html.py:85 -#: templates/editorial/manage_renkans.html:46 -#: templates/editorial/manage_renkans.html:69 -msgid "State" -msgstr "" - #: templates/profile_home.html:66 msgid "Edition" msgstr "" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:49 -msgid "Moderated" -msgstr "" - -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:50 -msgid "Published" -msgstr "" - -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:51 -msgid "Rejected" -msgstr "" - -#: templates/profile_home.html:72 templates/renkan_list.html:48 -#: templates/editorial/manage_renkans.html:54 -msgid "Favorite" -msgstr "" - -#: templates/profile_home.html:73 templates/renkan_list.html:50 -#: templates/editorial/manage_renkans.html:55 -msgid "Search" -msgstr "" - -#: templates/profile_home.html:80 templates/renkan_list.html:58 -#: templates/editorial/manage_renkans.html:62 -msgid "Fav." -msgstr "" - -#: templates/profile_home.html:84 templates/editorial/manage_renkans.html:68 -msgid "Preview" -msgstr "" - -#: templates/profile_home.html:87 templates/editorial/manage_renkans.html:71 -msgid "Actions" -msgstr "" - #: templates/profile_home.html:106 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "" @@ -583,157 +711,14 @@ "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:90 -msgid "publish renkan" -msgstr "" - #: templates/profile_home.html:116 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:117 templates/editorial/manage_renkans.html:91 -msgid "unpublish renkan" -msgstr "" - #: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" -#: templates/renkan_edit.html:66 -msgid "Ressources" -msgstr "" - -#: templates/renkan_edit.html:197 -msgid "Change organisation" -msgstr "" - -#: templates/renkan_edit.html:198 -msgid "(Indisponible si modification du RENKAN)" -msgstr "" - -#: templates/renkan_edit.html:201 templates/renkan_edit.html.py:205 -#: templates/renkan_edit.html:209 -msgid "View graph in column" -msgstr "" - -#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 -#: templates/renkan_edit.html:210 -msgid "View graph in line" -msgstr "" - -#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 -#: templates/renkan_edit.html:211 -msgid "View graph in circle" -msgstr "" - -#: templates/renkan_list.html:6 views/profile.py:143 -msgid "Marked Renkans list" -msgstr "" - -#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:25 -msgid "Username" -msgstr "" - -#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 -msgid "User" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:7 -msgid "Identifiants" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:19 -#: templates/registration/password_reset_form.html:18 -msgid "Sorry, that's not a valid username or password." -msgstr "" - -#: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:25 -msgid "Nom d'utilisateur" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:33 -msgid "Mot de passe" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:23 -msgid "Cancel" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:23 -#: templates/registration/login.html:5 templates/registration/login.html:33 -msgid "Login" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:36 -msgid "Forgot password ?" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:37 -msgid "Still not a user ? Create an account" -msgstr "" - -#: templates/editorial/manage_renkans.html:7 -msgid "Manage renkan publication" -msgstr "" - -#: templates/editorial/manage_renkans.html:29 -msgid "Are you sure you want to PUBLISH this renkan ?" -msgstr "" - -#: templates/editorial/manage_renkans.html:30 -msgid "Are you sure you want to UNPUBLISH this renkan ?" -msgstr "" - -#: templates/editorial/manage_renkans.html:31 -msgid "Are you sure you want to REJECT this renkan ?" -msgstr "" - -#: templates/editorial/manage_renkans.html:92 -msgid "reject renkan" -msgstr "" - -#: templates/envelope/contact.html:19 -msgid "" -"\n" -"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" -"

Remplissez le formulaire suivant :

\n" -" " -msgstr "" - -#: templates/envelope/contact.html:28 -msgid "Send!" -msgstr "" - -#: templates/hdabo/user_update_form.html:6 -msgid "Profile change" -msgstr "" - -#: templates/hdabo/user_update_form.html:15 -msgid "Change user profile" -msgstr "" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Precedent" -msgstr "" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Submit" -msgstr "" - #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "" @@ -800,19 +785,19 @@ msgid "Password change" msgstr "" -#: templates/registration/password_change_form.html:14 +#: templates/registration/password_change_form.html:15 msgid "Changer le mot de passe" msgstr "" -#: templates/registration/password_change_form.html:18 +#: templates/registration/password_change_form.html:19 msgid "Ancien mot de passe" msgstr "" -#: templates/registration/password_change_form.html:22 +#: templates/registration/password_change_form.html:23 msgid "Nouveau mot de passe" msgstr "" -#: templates/registration/password_change_form.html:26 +#: templates/registration/password_change_form.html:27 msgid "Nouveau mot de passe (Verification)" msgstr "" @@ -844,11 +829,11 @@ msgid "Password reset" msgstr "" -#: templates/registration/password_reset_form.html:16 +#: templates/registration/password_reset_form.html:17 msgid "Recuperation du Mot de Passe" msgstr "" -#: templates/registration/password_reset_form.html:23 +#: templates/registration/password_reset_form.html:24 msgid "Email du compte:" msgstr "" @@ -876,6 +861,37 @@ msgid "Mot de passe (Verification)" msgstr "" +#: templates/renkan_edit.html:67 +msgid "Ressources" +msgstr "" + +#: templates/renkan_edit.html:198 +msgid "Change organisation" +msgstr "" + +#: templates/renkan_edit.html:199 +msgid "(Indisponible si modification du RENKAN)" +msgstr "" + +#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 +#: templates/renkan_edit.html:210 +msgid "View graph in column" +msgstr "" + +#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 +#: templates/renkan_edit.html:211 +msgid "View graph in line" +msgstr "" + +#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208 +#: templates/renkan_edit.html:212 +msgid "View graph in circle" +msgstr "" + +#: templates/renkan_list.html:6 views/profile.py:143 +msgid "Marked Renkans list" +msgstr "" + #: views/profile.py:131 msgid "Public Renkans list" msgstr "" diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/ja/LC_MESSAGES/django.mo Binary file src/hdalab/locale/ja/LC_MESSAGES/django.mo has changed diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/ja/LC_MESSAGES/django.po --- a/src/hdalab/locale/ja/LC_MESSAGES/django.po Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/locale/ja/LC_MESSAGES/django.po Tue Mar 24 12:24:28 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 11:28-0500\n" +"POT-Creation-Date: 2015-03-19 09:40-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -18,6 +18,22 @@ "FULL NAME \n" "Plural-Forms: nplurals=1; plural=0\n" +#: models/renkan.py:32 +msgid "edition_state" +msgstr "" + +#: models/renkan.py:33 +msgid "moderated_state" +msgstr "" + +#: models/renkan.py:34 +msgid "published_state" +msgstr "" + +#: models/renkan.py:35 +msgid "rejected_state" +msgstr "" + #: settings.py:40 msgid "French" msgstr "フランス語" @@ -42,20 +58,20 @@ msgid "Japanese" msgstr "日本語" -#: models/renkan.py:32 -msgid "edition_state" +#: templates/400.html:6 templates/400.html.py:15 +msgid "Bad request" msgstr "" -#: models/renkan.py:33 -msgid "moderated_state" +#: templates/400.html:18 +msgid "Sorry, you sent a bad request." msgstr "" -#: models/renkan.py:34 -msgid "published_state" +#: templates/404.html:6 templates/404.html.py:15 +msgid "Page not found" msgstr "" -#: models/renkan.py:35 -msgid "rejected_state" +#: templates/404.html:18 +msgid "Sorry, but the requested page could not be found." msgstr "" #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 @@ -63,6 +79,49 @@ msgid "A Propos" msgstr "" +#: templates/ajax_identification/ajax_login.html:7 +msgid "Identifiants" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:9 +#: templates/registration/login.html:19 +#: templates/registration/password_reset_form.html:19 +msgid "Sorry, that's not a valid username or password." +msgstr "" + +#: templates/ajax_identification/ajax_login.html:15 +#: templates/registration/registration_form.html:25 +msgid "Nom d'utilisateur" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:19 +#: templates/registration/registration_form.html:33 +msgid "Mot de passe" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:23 +msgid "Cancel" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:23 +#: templates/registration/login.html:5 templates/registration/login.html:33 +msgid "Login" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:26 +#: templates/registration/login.html:36 +msgid "Forgot password ?" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:27 +#: templates/registration/login.html:37 +msgid "Still not a user ? Create an account" +msgstr "" + +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:50 +msgid "Log out" +msgstr "" + #: templates/base.html:38 msgid "Accueil" msgstr "" @@ -81,10 +140,6 @@ msgid "Thésaurus" msgstr "" -#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 -msgid "Log out" -msgstr "" - #: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 @@ -139,6 +194,150 @@ msgid "Credits" msgstr "" +#: templates/editorial/manage_renkans.html:7 +msgid "Manage renkan publication" +msgstr "" + +#: templates/editorial/manage_renkans.html:29 +msgid "Are you sure you want to PUBLISH this renkan ?" +msgstr "" + +#: templates/editorial/manage_renkans.html:30 +msgid "Are you sure you want to UNPUBLISH this renkan ?" +msgstr "" + +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" +msgstr "" + +#: templates/editorial/manage_renkans.html:39 templates/profile_home.html:36 +msgid "Administrer les Renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:41 +#: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 +#: templates/profile_home.html.py:125 templates/renkan_list.html:39 +#: templates/renkan_list.html.py:91 +msgid "Previous" +msgstr "" + +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 +#: templates/profile_home.html.py:126 templates/renkan_list.html:40 +#: templates/renkan_list.html.py:92 +msgid "Next" +msgstr "" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +#, fuzzy +msgid "Filter" +msgstr "フィルター" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +msgid "Advanced search" +msgstr "" + +#: templates/editorial/manage_renkans.html:45 +#: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 +#: templates/profile_home.html.py:78 templates/renkan_list.html:43 +#: templates/renkan_list.html.py:55 +msgid "Title" +msgstr "" + +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 +#: templates/profile_home.html.py:82 templates/renkan_list.html:44 +#: templates/renkan_list.html.py:63 +msgid "Modification date" +msgstr "" + +#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61 +#: templates/renkan_list.html:44 +msgid "begin" +msgstr "" + +#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62 +#: templates/renkan_list.html:45 +msgid "end" +msgstr "" + +#: templates/editorial/manage_renkans.html:48 +#: templates/registration/login.html:25 templates/renkan_list.html:46 +msgid "Username" +msgstr "" + +#: templates/editorial/manage_renkans.html:49 +#: templates/editorial/manage_renkans.html:72 templates/profile_home.html:63 +#: templates/profile_home.html.py:85 +msgid "State" +msgstr "" + +#: templates/editorial/manage_renkans.html:52 templates/profile_home.html:67 +msgid "Moderated" +msgstr "" + +#: templates/editorial/manage_renkans.html:53 templates/profile_home.html:68 +msgid "Published" +msgstr "" + +#: templates/editorial/manage_renkans.html:54 templates/profile_home.html:69 +msgid "Rejected" +msgstr "" + +#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 +#: templates/renkan_list.html:48 +msgid "Favorite" +msgstr "" + +#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 +#: templates/renkan_list.html:50 +msgid "Search" +msgstr "" + +#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 +#: templates/renkan_list.html:58 +msgid "Fav." +msgstr "" + +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61 +msgid "User" +msgstr "" + +#: templates/editorial/manage_renkans.html:71 templates/profile_home.html:84 +msgid "Preview" +msgstr "" + +#: templates/editorial/manage_renkans.html:74 templates/profile_home.html:87 +msgid "Actions" +msgstr "" + +#: templates/editorial/manage_renkans.html:93 templates/profile_home.html:116 +msgid "publish renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:94 templates/profile_home.html:117 +msgid "unpublish renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:95 +msgid "reject renkan" +msgstr "" + +#: templates/envelope/contact.html:19 +msgid "" +"\n" +"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" +"

Remplissez le formulaire suivant :

\n" +" " +msgstr "" + +#: templates/envelope/contact.html:28 +msgid "Send!" +msgstr "" + #: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "ファセット検索" @@ -197,6 +396,29 @@ msgid "Resultats de recherche" msgstr "検索結果" +#: templates/hdabo/user_update_form.html:6 +msgid "Profile change" +msgstr "" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "" + #: templates/help_popup.html:7 msgid "Fermer
ce didacticiel" msgstr "" @@ -441,10 +663,6 @@ msgid "Adminsitration du Site" msgstr "" -#: templates/profile_home.html:36 -msgid "Administrer les Renkan" -msgstr "" - #: templates/profile_home.html:37 msgid "Editorialisation" msgstr "" @@ -477,100 +695,10 @@ msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:91 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:100 -msgid "Previous" -msgstr "" - -#: templates/profile_home.html:57 templates/profile_home.html.py:126 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:92 -#: templates/editorial/manage_renkans.html:39 -#: templates/editorial/manage_renkans.html:101 -msgid "Next" -msgstr "" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -#, fuzzy -msgid "Filter" -msgstr "フィルター" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -msgid "Advanced search" -msgstr "" - -#: templates/profile_home.html:60 templates/profile_home.html.py:78 -#: templates/renkan_list.html:43 templates/renkan_list.html.py:55 -#: templates/editorial/manage_renkans.html:42 -#: templates/editorial/manage_renkans.html:60 -msgid "Title" -msgstr "" - -#: templates/profile_home.html:61 templates/profile_home.html.py:82 -#: templates/renkan_list.html:44 templates/renkan_list.html.py:63 -#: templates/editorial/manage_renkans.html:43 -#: templates/editorial/manage_renkans.html:66 -msgid "Modification date" -msgstr "" - -#: templates/profile_home.html:61 templates/renkan_list.html:44 -#: templates/editorial/manage_renkans.html:43 -msgid "begin" -msgstr "" - -#: templates/profile_home.html:62 templates/renkan_list.html:45 -#: templates/editorial/manage_renkans.html:44 -msgid "end" -msgstr "" - -#: templates/profile_home.html:63 templates/profile_home.html.py:85 -#: templates/editorial/manage_renkans.html:46 -#: templates/editorial/manage_renkans.html:69 -msgid "State" -msgstr "" - #: templates/profile_home.html:66 msgid "Edition" msgstr "" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:49 -msgid "Moderated" -msgstr "" - -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:50 -msgid "Published" -msgstr "" - -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:51 -msgid "Rejected" -msgstr "" - -#: templates/profile_home.html:72 templates/renkan_list.html:48 -#: templates/editorial/manage_renkans.html:54 -msgid "Favorite" -msgstr "" - -#: templates/profile_home.html:73 templates/renkan_list.html:50 -#: templates/editorial/manage_renkans.html:55 -msgid "Search" -msgstr "" - -#: templates/profile_home.html:80 templates/renkan_list.html:58 -#: templates/editorial/manage_renkans.html:62 -msgid "Fav." -msgstr "" - -#: templates/profile_home.html:84 templates/editorial/manage_renkans.html:68 -msgid "Preview" -msgstr "" - -#: templates/profile_home.html:87 templates/editorial/manage_renkans.html:71 -msgid "Actions" -msgstr "" - #: templates/profile_home.html:106 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "" @@ -584,157 +712,14 @@ "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:90 -msgid "publish renkan" -msgstr "" - #: templates/profile_home.html:116 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:117 templates/editorial/manage_renkans.html:91 -msgid "unpublish renkan" -msgstr "" - #: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" -#: templates/renkan_edit.html:66 -msgid "Ressources" -msgstr "" - -#: templates/renkan_edit.html:197 -msgid "Change organisation" -msgstr "" - -#: templates/renkan_edit.html:198 -msgid "(Indisponible si modification du RENKAN)" -msgstr "" - -#: templates/renkan_edit.html:201 templates/renkan_edit.html.py:205 -#: templates/renkan_edit.html:209 -msgid "View graph in column" -msgstr "" - -#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 -#: templates/renkan_edit.html:210 -msgid "View graph in line" -msgstr "" - -#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 -#: templates/renkan_edit.html:211 -msgid "View graph in circle" -msgstr "" - -#: templates/renkan_list.html:6 views/profile.py:143 -msgid "Marked Renkans list" -msgstr "" - -#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:25 -msgid "Username" -msgstr "" - -#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 -msgid "User" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:7 -msgid "Identifiants" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:19 -#: templates/registration/password_reset_form.html:18 -msgid "Sorry, that's not a valid username or password." -msgstr "" - -#: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:25 -msgid "Nom d'utilisateur" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:33 -msgid "Mot de passe" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:23 -msgid "Cancel" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:23 -#: templates/registration/login.html:5 templates/registration/login.html:33 -msgid "Login" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:36 -msgid "Forgot password ?" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:37 -msgid "Still not a user ? Create an account" -msgstr "" - -#: templates/editorial/manage_renkans.html:7 -msgid "Manage renkan publication" -msgstr "" - -#: templates/editorial/manage_renkans.html:29 -msgid "Are you sure you want to PUBLISH this renkan ?" -msgstr "" - -#: templates/editorial/manage_renkans.html:30 -msgid "Are you sure you want to UNPUBLISH this renkan ?" -msgstr "" - -#: templates/editorial/manage_renkans.html:31 -msgid "Are you sure you want to REJECT this renkan ?" -msgstr "" - -#: templates/editorial/manage_renkans.html:92 -msgid "reject renkan" -msgstr "" - -#: templates/envelope/contact.html:19 -msgid "" -"\n" -"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" -"

Remplissez le formulaire suivant :

\n" -" " -msgstr "" - -#: templates/envelope/contact.html:28 -msgid "Send!" -msgstr "" - -#: templates/hdabo/user_update_form.html:6 -msgid "Profile change" -msgstr "" - -#: templates/hdabo/user_update_form.html:15 -msgid "Change user profile" -msgstr "" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Precedent" -msgstr "" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Submit" -msgstr "" - #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "" @@ -801,19 +786,19 @@ msgid "Password change" msgstr "" -#: templates/registration/password_change_form.html:14 +#: templates/registration/password_change_form.html:15 msgid "Changer le mot de passe" msgstr "" -#: templates/registration/password_change_form.html:18 +#: templates/registration/password_change_form.html:19 msgid "Ancien mot de passe" msgstr "" -#: templates/registration/password_change_form.html:22 +#: templates/registration/password_change_form.html:23 msgid "Nouveau mot de passe" msgstr "" -#: templates/registration/password_change_form.html:26 +#: templates/registration/password_change_form.html:27 msgid "Nouveau mot de passe (Verification)" msgstr "" @@ -845,11 +830,11 @@ msgid "Password reset" msgstr "" -#: templates/registration/password_reset_form.html:16 +#: templates/registration/password_reset_form.html:17 msgid "Recuperation du Mot de Passe" msgstr "" -#: templates/registration/password_reset_form.html:23 +#: templates/registration/password_reset_form.html:24 msgid "Email du compte:" msgstr "" @@ -877,6 +862,37 @@ msgid "Mot de passe (Verification)" msgstr "" +#: templates/renkan_edit.html:67 +msgid "Ressources" +msgstr "" + +#: templates/renkan_edit.html:198 +msgid "Change organisation" +msgstr "" + +#: templates/renkan_edit.html:199 +msgid "(Indisponible si modification du RENKAN)" +msgstr "" + +#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 +#: templates/renkan_edit.html:210 +msgid "View graph in column" +msgstr "" + +#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 +#: templates/renkan_edit.html:211 +msgid "View graph in line" +msgstr "" + +#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208 +#: templates/renkan_edit.html:212 +msgid "View graph in circle" +msgstr "" + +#: templates/renkan_list.html:6 views/profile.py:143 +msgid "Marked Renkans list" +msgstr "" + #: views/profile.py:131 msgid "Public Renkans list" msgstr "" diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo Binary file src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo has changed diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/locale/zh-tw/LC_MESSAGES/django.po --- a/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Tue Mar 24 12:24:28 2015 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-11 11:28-0500\n" +"POT-Creation-Date: 2015-03-19 09:40-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,22 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" +#: models/renkan.py:32 +msgid "edition_state" +msgstr "" + +#: models/renkan.py:33 +msgid "moderated_state" +msgstr "" + +#: models/renkan.py:34 +msgid "published_state" +msgstr "" + +#: models/renkan.py:35 +msgid "rejected_state" +msgstr "" + #: settings.py:40 msgid "French" msgstr "Français" @@ -42,20 +58,20 @@ msgid "Japanese" msgstr "" -#: models/renkan.py:32 -msgid "edition_state" +#: templates/400.html:6 templates/400.html.py:15 +msgid "Bad request" msgstr "" -#: models/renkan.py:33 -msgid "moderated_state" +#: templates/400.html:18 +msgid "Sorry, you sent a bad request." msgstr "" -#: models/renkan.py:34 -msgid "published_state" +#: templates/404.html:6 templates/404.html.py:15 +msgid "Page not found" msgstr "" -#: models/renkan.py:35 -msgid "rejected_state" +#: templates/404.html:18 +msgid "Sorry, but the requested page could not be found." msgstr "" #: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75 @@ -63,6 +79,49 @@ msgid "A Propos" msgstr "" +#: templates/ajax_identification/ajax_login.html:7 +msgid "Identifiants" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:9 +#: templates/registration/login.html:19 +#: templates/registration/password_reset_form.html:19 +msgid "Sorry, that's not a valid username or password." +msgstr "" + +#: templates/ajax_identification/ajax_login.html:15 +#: templates/registration/registration_form.html:25 +msgid "Nom d'utilisateur" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:19 +#: templates/registration/registration_form.html:33 +msgid "Mot de passe" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:23 +msgid "Cancel" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:23 +#: templates/registration/login.html:5 templates/registration/login.html:33 +msgid "Login" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:26 +#: templates/registration/login.html:36 +msgid "Forgot password ?" +msgstr "" + +#: templates/ajax_identification/ajax_login.html:27 +#: templates/registration/login.html:37 +msgid "Still not a user ? Create an account" +msgstr "" + +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:50 +msgid "Log out" +msgstr "" + #: templates/base.html:38 msgid "Accueil" msgstr "" @@ -81,10 +140,6 @@ msgid "Thésaurus" msgstr "" -#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4 -msgid "Log out" -msgstr "" - #: templates/base.html:52 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 @@ -139,6 +194,150 @@ msgid "Credits" msgstr "" +#: templates/editorial/manage_renkans.html:7 +msgid "Manage renkan publication" +msgstr "" + +#: templates/editorial/manage_renkans.html:29 +msgid "Are you sure you want to PUBLISH this renkan ?" +msgstr "" + +#: templates/editorial/manage_renkans.html:30 +msgid "Are you sure you want to UNPUBLISH this renkan ?" +msgstr "" + +#: templates/editorial/manage_renkans.html:31 +msgid "Are you sure you want to REJECT this renkan ?" +msgstr "" + +#: templates/editorial/manage_renkans.html:39 templates/profile_home.html:36 +msgid "Administrer les Renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:41 +#: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 +#: templates/profile_home.html.py:125 templates/renkan_list.html:39 +#: templates/renkan_list.html.py:91 +msgid "Previous" +msgstr "" + +#: templates/editorial/manage_renkans.html:42 +#: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 +#: templates/profile_home.html.py:126 templates/renkan_list.html:40 +#: templates/renkan_list.html.py:92 +msgid "Next" +msgstr "" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +#, fuzzy +msgid "Filter" +msgstr "Filtres :" + +#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 +#: templates/renkan_list.html:41 +msgid "Advanced search" +msgstr "" + +#: templates/editorial/manage_renkans.html:45 +#: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 +#: templates/profile_home.html.py:78 templates/renkan_list.html:43 +#: templates/renkan_list.html.py:55 +msgid "Title" +msgstr "" + +#: templates/editorial/manage_renkans.html:46 +#: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 +#: templates/profile_home.html.py:82 templates/renkan_list.html:44 +#: templates/renkan_list.html.py:63 +msgid "Modification date" +msgstr "" + +#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61 +#: templates/renkan_list.html:44 +msgid "begin" +msgstr "" + +#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62 +#: templates/renkan_list.html:45 +msgid "end" +msgstr "" + +#: templates/editorial/manage_renkans.html:48 +#: templates/registration/login.html:25 templates/renkan_list.html:46 +msgid "Username" +msgstr "" + +#: templates/editorial/manage_renkans.html:49 +#: templates/editorial/manage_renkans.html:72 templates/profile_home.html:63 +#: templates/profile_home.html.py:85 +msgid "State" +msgstr "" + +#: templates/editorial/manage_renkans.html:52 templates/profile_home.html:67 +msgid "Moderated" +msgstr "" + +#: templates/editorial/manage_renkans.html:53 templates/profile_home.html:68 +msgid "Published" +msgstr "" + +#: templates/editorial/manage_renkans.html:54 templates/profile_home.html:69 +msgid "Rejected" +msgstr "" + +#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 +#: templates/renkan_list.html:48 +msgid "Favorite" +msgstr "" + +#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 +#: templates/renkan_list.html:50 +msgid "Search" +msgstr "" + +#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 +#: templates/renkan_list.html:58 +msgid "Fav." +msgstr "" + +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61 +msgid "User" +msgstr "" + +#: templates/editorial/manage_renkans.html:71 templates/profile_home.html:84 +msgid "Preview" +msgstr "" + +#: templates/editorial/manage_renkans.html:74 templates/profile_home.html:87 +msgid "Actions" +msgstr "" + +#: templates/editorial/manage_renkans.html:93 templates/profile_home.html:116 +msgid "publish renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:94 templates/profile_home.html:117 +msgid "unpublish renkan" +msgstr "" + +#: templates/editorial/manage_renkans.html:95 +msgid "reject renkan" +msgstr "" + +#: templates/envelope/contact.html:19 +msgid "" +"\n" +"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" +"

Remplissez le formulaire suivant :

\n" +" " +msgstr "" + +#: templates/envelope/contact.html:28 +msgid "Send!" +msgstr "" + #: templates/facettes.html:5 templates/facettes.html.py:46 msgid "Recherche par facettes" msgstr "Recherche par facettes" @@ -197,6 +396,29 @@ msgid "Resultats de recherche" msgstr "Résultats de recherche" +#: templates/hdabo/user_update_form.html:6 +msgid "Profile change" +msgstr "" + +#: templates/hdabo/user_update_form.html:15 +msgid "Change user profile" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Precedent" +msgstr "" + +#: templates/hdabo/user_update_form.html:20 +#: templates/registration/password_change_form.html:31 +#: templates/registration/password_reset_confirm.html:19 +#: templates/registration/password_reset_form.html:28 +#: templates/registration/registration_form.html:41 +msgid "Submit" +msgstr "" + #: templates/help_popup.html:7 msgid "Fermer
ce didacticiel" msgstr "" @@ -441,10 +663,6 @@ msgid "Adminsitration du Site" msgstr "" -#: templates/profile_home.html:36 -msgid "Administrer les Renkan" -msgstr "" - #: templates/profile_home.html:37 msgid "Editorialisation" msgstr "" @@ -477,100 +695,10 @@ msgid "Nouveau Renkan" msgstr "" -#: templates/profile_home.html:56 templates/profile_home.html.py:125 -#: templates/renkan_list.html:39 templates/renkan_list.html.py:91 -#: templates/editorial/manage_renkans.html:38 -#: templates/editorial/manage_renkans.html:100 -msgid "Previous" -msgstr "" - -#: templates/profile_home.html:57 templates/profile_home.html.py:126 -#: templates/renkan_list.html:40 templates/renkan_list.html.py:92 -#: templates/editorial/manage_renkans.html:39 -#: templates/editorial/manage_renkans.html:101 -msgid "Next" -msgstr "" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -#, fuzzy -msgid "Filter" -msgstr "Filtres :" - -#: templates/profile_home.html:58 templates/renkan_list.html:41 -#: templates/editorial/manage_renkans.html:40 -msgid "Advanced search" -msgstr "" - -#: templates/profile_home.html:60 templates/profile_home.html.py:78 -#: templates/renkan_list.html:43 templates/renkan_list.html.py:55 -#: templates/editorial/manage_renkans.html:42 -#: templates/editorial/manage_renkans.html:60 -msgid "Title" -msgstr "" - -#: templates/profile_home.html:61 templates/profile_home.html.py:82 -#: templates/renkan_list.html:44 templates/renkan_list.html.py:63 -#: templates/editorial/manage_renkans.html:43 -#: templates/editorial/manage_renkans.html:66 -msgid "Modification date" -msgstr "" - -#: templates/profile_home.html:61 templates/renkan_list.html:44 -#: templates/editorial/manage_renkans.html:43 -msgid "begin" -msgstr "" - -#: templates/profile_home.html:62 templates/renkan_list.html:45 -#: templates/editorial/manage_renkans.html:44 -msgid "end" -msgstr "" - -#: templates/profile_home.html:63 templates/profile_home.html.py:85 -#: templates/editorial/manage_renkans.html:46 -#: templates/editorial/manage_renkans.html:69 -msgid "State" -msgstr "" - #: templates/profile_home.html:66 msgid "Edition" msgstr "" -#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:49 -msgid "Moderated" -msgstr "" - -#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:50 -msgid "Published" -msgstr "" - -#: templates/profile_home.html:69 templates/editorial/manage_renkans.html:51 -msgid "Rejected" -msgstr "" - -#: templates/profile_home.html:72 templates/renkan_list.html:48 -#: templates/editorial/manage_renkans.html:54 -msgid "Favorite" -msgstr "" - -#: templates/profile_home.html:73 templates/renkan_list.html:50 -#: templates/editorial/manage_renkans.html:55 -msgid "Search" -msgstr "" - -#: templates/profile_home.html:80 templates/renkan_list.html:58 -#: templates/editorial/manage_renkans.html:62 -msgid "Fav." -msgstr "" - -#: templates/profile_home.html:84 templates/editorial/manage_renkans.html:68 -msgid "Preview" -msgstr "" - -#: templates/profile_home.html:87 templates/editorial/manage_renkans.html:71 -msgid "Actions" -msgstr "" - #: templates/profile_home.html:106 templates/renkan_list.html:83 msgid "Are you sure you want to copy this renkan ?" msgstr "" @@ -584,157 +712,14 @@ "Are you sure you want to delete this renkan ? You cannot undo this action." msgstr "" -#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:90 -msgid "publish renkan" -msgstr "" - #: templates/profile_home.html:116 msgid "Are you sure you want to ask to publish this renkan ?" msgstr "" -#: templates/profile_home.html:117 templates/editorial/manage_renkans.html:91 -msgid "unpublish renkan" -msgstr "" - #: templates/profile_home.html:117 msgid "Are you sure you want to unpublish this renkan ?" msgstr "" -#: templates/renkan_edit.html:66 -msgid "Ressources" -msgstr "" - -#: templates/renkan_edit.html:197 -msgid "Change organisation" -msgstr "" - -#: templates/renkan_edit.html:198 -msgid "(Indisponible si modification du RENKAN)" -msgstr "" - -#: templates/renkan_edit.html:201 templates/renkan_edit.html.py:205 -#: templates/renkan_edit.html:209 -msgid "View graph in column" -msgstr "" - -#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 -#: templates/renkan_edit.html:210 -msgid "View graph in line" -msgstr "" - -#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 -#: templates/renkan_edit.html:211 -msgid "View graph in circle" -msgstr "" - -#: templates/renkan_list.html:6 views/profile.py:143 -msgid "Marked Renkans list" -msgstr "" - -#: templates/renkan_list.html:46 templates/editorial/manage_renkans.html:45 -#: templates/registration/login.html:25 -msgid "Username" -msgstr "" - -#: templates/renkan_list.html:61 templates/editorial/manage_renkans.html:64 -msgid "User" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:7 -msgid "Identifiants" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:9 -#: templates/registration/login.html:19 -#: templates/registration/password_reset_form.html:18 -msgid "Sorry, that's not a valid username or password." -msgstr "" - -#: templates/ajax_identification/ajax_login.html:15 -#: templates/registration/registration_form.html:25 -msgid "Nom d'utilisateur" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:19 -#: templates/registration/registration_form.html:33 -msgid "Mot de passe" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:23 -msgid "Cancel" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:23 -#: templates/registration/login.html:5 templates/registration/login.html:33 -msgid "Login" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:26 -#: templates/registration/login.html:36 -msgid "Forgot password ?" -msgstr "" - -#: templates/ajax_identification/ajax_login.html:27 -#: templates/registration/login.html:37 -msgid "Still not a user ? Create an account" -msgstr "" - -#: templates/editorial/manage_renkans.html:7 -msgid "Manage renkan publication" -msgstr "" - -#: templates/editorial/manage_renkans.html:29 -msgid "Are you sure you want to PUBLISH this renkan ?" -msgstr "" - -#: templates/editorial/manage_renkans.html:30 -msgid "Are you sure you want to UNPUBLISH this renkan ?" -msgstr "" - -#: templates/editorial/manage_renkans.html:31 -msgid "Are you sure you want to REJECT this renkan ?" -msgstr "" - -#: templates/editorial/manage_renkans.html:92 -msgid "reject renkan" -msgstr "" - -#: templates/envelope/contact.html:19 -msgid "" -"\n" -"

Vous souhaitez poser une question sur Histoire des arts' Lab ?\n" -"

Remplissez le formulaire suivant :

\n" -" " -msgstr "" - -#: templates/envelope/contact.html:28 -msgid "Send!" -msgstr "" - -#: templates/hdabo/user_update_form.html:6 -msgid "Profile change" -msgstr "" - -#: templates/hdabo/user_update_form.html:15 -msgid "Change user profile" -msgstr "" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Precedent" -msgstr "" - -#: templates/hdabo/user_update_form.html:20 -#: templates/registration/password_change_form.html:30 -#: templates/registration/password_reset_confirm.html:19 -#: templates/registration/password_reset_form.html:27 -#: templates/registration/registration_form.html:41 -msgid "Submit" -msgstr "" - #: templates/registration/activate.html:5 msgid "Registration - Activated" msgstr "" @@ -801,19 +786,19 @@ msgid "Password change" msgstr "" -#: templates/registration/password_change_form.html:14 +#: templates/registration/password_change_form.html:15 msgid "Changer le mot de passe" msgstr "" -#: templates/registration/password_change_form.html:18 +#: templates/registration/password_change_form.html:19 msgid "Ancien mot de passe" msgstr "" -#: templates/registration/password_change_form.html:22 +#: templates/registration/password_change_form.html:23 msgid "Nouveau mot de passe" msgstr "" -#: templates/registration/password_change_form.html:26 +#: templates/registration/password_change_form.html:27 msgid "Nouveau mot de passe (Verification)" msgstr "" @@ -845,11 +830,11 @@ msgid "Password reset" msgstr "" -#: templates/registration/password_reset_form.html:16 +#: templates/registration/password_reset_form.html:17 msgid "Recuperation du Mot de Passe" msgstr "" -#: templates/registration/password_reset_form.html:23 +#: templates/registration/password_reset_form.html:24 msgid "Email du compte:" msgstr "" @@ -877,6 +862,37 @@ msgid "Mot de passe (Verification)" msgstr "" +#: templates/renkan_edit.html:67 +msgid "Ressources" +msgstr "" + +#: templates/renkan_edit.html:198 +msgid "Change organisation" +msgstr "" + +#: templates/renkan_edit.html:199 +msgid "(Indisponible si modification du RENKAN)" +msgstr "" + +#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206 +#: templates/renkan_edit.html:210 +msgid "View graph in column" +msgstr "" + +#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207 +#: templates/renkan_edit.html:211 +msgid "View graph in line" +msgstr "" + +#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208 +#: templates/renkan_edit.html:212 +msgid "View graph in circle" +msgstr "" + +#: templates/renkan_list.html:6 views/profile.py:143 +msgid "Marked Renkans list" +msgstr "" + #: views/profile.py:131 msgid "Public Renkans list" msgstr "" diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/management/commands/import_hdabo_db.py --- a/src/hdalab/management/commands/import_hdabo_db.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/management/commands/import_hdabo_db.py Tue Mar 24 12:24:28 2015 +0100 @@ -30,7 +30,7 @@ data_path = args[0] print("=========== MIGRATE ===========") - call_command('syncdb', migrate=True) + call_command('migrate') if options.get('categories', False): print("=========== QUERY WIKIPEDIA CATEGORY ===========") call_command('query_wikipedia_category', interactive=False, force=True, all=True) diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/management/commands/query_category_inclusion.py --- a/src/hdalab/management/commands/query_category_inclusion.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/management/commands/query_category_inclusion.py Tue Mar 24 12:24:28 2015 +0100 @@ -162,6 +162,6 @@ title = CATEGORY_PREFIX + category.label # query categories - with transaction.commit_on_success(): + with transaction.atomic(): res = self.query_all_categories(title, site) self.process_categories(res, category) \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/management/commands/query_dbpedia.py --- a/src/hdalab/management/commands/query_dbpedia.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/management/commands/query_dbpedia.py Tue Mar 24 12:24:28 2015 +0100 @@ -152,7 +152,7 @@ abstracts = {} labels = {} thumbnail = None - with transaction.commit_on_success(): + with transaction.atomic(): res_abstracts = self.query_dbpedia("select distinct ?y where {<%s> ?y}" % (tag.dbpedia_uri), 'n3') for _,_,o in res_abstracts.triples((None, URIRef('http://www.w3.org/2005/sparql-results#value'), None)): abstracts[o.language] = (unicode(o), True) diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/management/commands/query_wikipedia_category.py --- a/src/hdalab/management/commands/query_wikipedia_category.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/management/commands/query_wikipedia_category.py Tue Mar 24 12:24:28 2015 +0100 @@ -381,7 +381,7 @@ if tag.url_status == Tag.TAG_URL_STATUS_DICT['redirection'] and tag.alternative_wikipedia_pageid is not None : wikipedia_pageid = tag.alternative_label if use_label else tag.alternative_wikipedia_pageid - with transaction.commit_on_success(): + with transaction.atomic(): if types_mask & TYPES_MASK_DICT['visible']: res = self.query_all_categories(False, site, wikipedia_pageid, use_label) self.process_categories(res, False, tag) diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0001_initial.py --- a/src/hdalab/migrations/0001_initial.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/migrations/0001_initial.py Tue Mar 24 12:24:28 2015 +0100 @@ -1,135 +1,247 @@ -# encoding: utf-8 -from south.db import db -from south.v2 import SchemaMigration - -class Migration(SchemaMigration): - - depends_on = ( - ("hdabo", "0007_auto__add_folder"), - ) - - def forwards(self, orm): - - # Adding model 'WpCategory' - db.create_table('hdalab_wpcategory', ( #@UndefinedVariable - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('label', self.gf('django.db.models.fields.CharField')(unique=True, max_length=2048)), - )) - db.send_create_signal('hdalab', ['WpCategory']) #@UndefinedVariable - - # Adding model 'TagWpCategory' - db.create_table('hdalab_tagwpcategory', ( #@UndefinedVariable - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('tag', self.gf('django.db.models.fields.related.ForeignKey')(related_name='wp_categories', to=orm['hdabo.Tag'])), - ('wp_category', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdalab.WpCategory'])), - ('hidden', self.gf('django.db.models.fields.BooleanField')(default=False)), - )) - db.send_create_signal('hdalab', ['TagWpCategory']) #@UndefinedVariable +# -*- coding: utf-8 -*- +from __future__ import unicode_literals - # Adding unique constraint on 'TagWpCategory', fields ['tag', 'wp_category', 'hidden'] - db.create_unique('hdalab_tagwpcategory', ['tag_id', 'wp_category_id', 'hidden']) #@UndefinedVariable - - # Adding model 'TagInfobox' - db.create_table('hdalab_taginfobox', ( #@UndefinedVariable - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('tag', self.gf('django.db.models.fields.related.ForeignKey')(related_name='infoboxes', to=orm['hdabo.Tag'])), - ('name', self.gf('django.db.models.fields.CharField')(max_length=2048)), - ('source', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), - ('revision_id', self.gf('django.db.models.fields.BigIntegerField')(null=True, blank=True)), - )) - db.send_create_signal('hdalab', ['TagInfobox']) #@UndefinedVariable - - # Adding unique constraint on 'TagInfobox', fields ['tag', 'name', 'revision_id'] - db.create_unique('hdalab_taginfobox', ['tag_id', 'name', 'revision_id']) #@UndefinedVariable - - # Adding model 'InfoboxParameter' - db.create_table('hdalab_infoboxparameter', ( #@UndefinedVariable - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('tag_infobox', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdalab.TagInfobox'])), - ('param_name', self.gf('django.db.models.fields.CharField')(max_length=2048)), - ('param_value', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), - )) - db.send_create_signal('hdalab', ['InfoboxParameter']) #@UndefinedVariable - - # Adding unique constraint on 'InfoboxParameter', fields ['tag_infobox', 'param_name'] - db.create_unique('hdalab_infoboxparameter', ['tag_infobox_id', 'param_name']) #@UndefinedVariable +from django.db import models, migrations +import hdalab.fields +from django.conf import settings - def backwards(self, orm): - - # Removing unique constraint on 'InfoboxParameter', fields ['tag_infobox', 'param_name'] - db.delete_unique('hdalab_infoboxparameter', ['tag_infobox_id', 'param_name']) #@UndefinedVariable - - # Removing unique constraint on 'TagInfobox', fields ['tag', 'name', 'revision_id'] - db.delete_unique('hdalab_taginfobox', ['tag_id', 'name', 'revision_id']) #@UndefinedVariable - - # Removing unique constraint on 'TagWpCategory', fields ['tag', 'wp_category', 'hidden'] - db.delete_unique('hdalab_tagwpcategory', ['tag_id', 'wp_category_id', 'hidden']) #@UndefinedVariable +class Migration(migrations.Migration): - # Deleting model 'WpCategory' - db.delete_table('hdalab_wpcategory') #@UndefinedVariable - - # Deleting model 'TagWpCategory' - db.delete_table('hdalab_tagwpcategory') #@UndefinedVariable - - # Deleting model 'TagInfobox' - db.delete_table('hdalab_taginfobox') #@UndefinedVariable - - # Deleting model 'InfoboxParameter' - db.delete_table('hdalab_infoboxparameter') #@UndefinedVariable - + dependencies = [ + ('hdabo', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('renkanmanager', '0001_initial'), + ] - models = { - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': "orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - } - } - - complete_apps = ['hdalab'] + operations = [ + migrations.CreateModel( + name='Country', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('dbpedia_uri', models.URLField(unique=True, max_length=255, db_index=True)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='DatasheetExtras', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('datasheet', models.OneToOneField(related_name='extras', to='hdabo.Datasheet')), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='DbpediaFields', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('dbpedia_uri', models.URLField(max_length=2048, db_index=True)), + ('abstract', models.TextField(null=True, blank=True)), + ('thumbnail', models.URLField(max_length=2048, null=True, blank=True)), + ('label', models.CharField(max_length=2048, null=True, blank=True)), + ('tag', hdalab.fields.OneToOneField(related_name='dbpedia_fields', to='hdabo.Tag', related_default=b'lambda:')), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='DbpediaFieldsTranslation', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('language_code', models.CharField(max_length=15, db_index=True)), + ('label', models.CharField(max_length=2048, blank=True)), + ('abstract', models.TextField(null=True, blank=True)), + ('is_label_translated', models.BooleanField(default=True)), + ('is_abstract_translated', models.BooleanField(default=True)), + ('master', models.ForeignKey(related_name='translations', to='hdalab.DbpediaFields')), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='GeoInclusion', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('country', models.ForeignKey(related_name='includes', to='hdalab.Country')), + ('tag', models.OneToOneField(related_name='locatedin', to='hdabo.Tag')), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='HdalabRenkan', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('state', models.IntegerField(default=1, choices=[(1, b'edition'), (2, b'moderated'), (3, b'published'), (4, b'rejected')])), + ('favorite', models.BooleanField(default=False)), + ('renkan', models.ForeignKey(to='renkanmanager.Renkan')), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='HdalabRenkanStateTransition', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('from_state', models.IntegerField(default=1, choices=[(1, b'edition'), (2, b'moderated'), (3, b'published'), (4, b'rejected')])), + ('to_state', models.IntegerField(default=1, choices=[(1, b'edition'), (2, b'moderated'), (3, b'published'), (4, b'rejected')])), + ('ts', models.DateTimeField(auto_now_add=True)), + ('message', models.TextField(null=True, blank=True)), + ('author', models.ForeignKey(to=settings.AUTH_USER_MODEL)), + ('renkan', models.ForeignKey(related_name='states', to='hdalab.HdalabRenkan')), + ], + options={ + 'ordering': ['-ts'], + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='HdaSession', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('sessionid', models.CharField(unique=True, max_length=36, db_index=True)), + ('data', models.TextField(null=True, blank=True)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='InfoboxParameter', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('param_name', models.CharField(max_length=2048)), + ('param_value', models.TextField(null=True, blank=True)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='InseeCoords', + fields=[ + ('insee', models.IntegerField(serialize=False, primary_key=True)), + ('city_name', models.CharField(max_length=255)), + ('latitude', models.FloatField()), + ('longitude', models.FloatField()), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='TagInfobox', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('name', models.CharField(max_length=2048)), + ('source', models.TextField(null=True, blank=True)), + ('revision_id', models.BigIntegerField(null=True, blank=True)), + ('tag', models.ForeignKey(related_name='infoboxes', to='hdabo.Tag')), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='TagLinks', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('object', models.ForeignKey(related_name='taglinks_objects', to='hdabo.Tag')), + ('subject', models.ForeignKey(related_name='taglinks_subjects', to='hdabo.Tag')), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='TagWpCategory', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('hidden', models.BooleanField(default=False)), + ('tag', models.ForeignKey(related_name='wp_categories', to='hdabo.Tag')), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='TagYears', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('start_year', models.IntegerField(db_index=True)), + ('end_year', models.IntegerField(db_index=True)), + ('tag', models.ForeignKey(related_name='years', to='hdabo.Tag', unique=True)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='WpCategory', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('label', models.CharField(unique=True, max_length=2048)), + ], + options={ + 'verbose_name_plural': 'WpCategories', + }, + bases=(models.Model,), + ), + migrations.CreateModel( + name='WpCategoryInclusion', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('child_category', models.ForeignKey(related_name='parent_categories', to='hdalab.WpCategory')), + ('parent_category', models.ForeignKey(related_name='child_categories', to='hdalab.WpCategory')), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.AlterUniqueTogether( + name='wpcategoryinclusion', + unique_together=set([('parent_category', 'child_category')]), + ), + migrations.AddField( + model_name='tagwpcategory', + name='wp_category', + field=models.ForeignKey(related_name='tags', to='hdalab.WpCategory'), + preserve_default=True, + ), + migrations.AlterUniqueTogether( + name='tagwpcategory', + unique_together=set([('tag', 'wp_category', 'hidden')]), + ), + migrations.AlterUniqueTogether( + name='taginfobox', + unique_together=set([('tag', 'name', 'revision_id')]), + ), + migrations.AddField( + model_name='infoboxparameter', + name='tag_infobox', + field=models.ForeignKey(to='hdalab.TagInfobox'), + preserve_default=True, + ), + migrations.AlterUniqueTogether( + name='infoboxparameter', + unique_together=set([('tag_infobox', 'param_name')]), + ), + migrations.AlterUniqueTogether( + name='dbpediafieldstranslation', + unique_together=set([('master', 'language_code')]), + ), + migrations.AddField( + model_name='datasheetextras', + name='insee', + field=models.ForeignKey(blank=True, to='hdalab.InseeCoords', null=True), + preserve_default=True, + ), + ] diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0002_dataviz.py --- a/src/hdalab/migrations/0002_dataviz.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,144 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding model 'DbpediaFields' - db.create_table('hdalab_dbpediafields', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('dbpedia_uri', self.gf('django.db.models.fields.URLField')(unique=True, max_length=2048, db_index=True)), - ('tag', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='dbpedia_fields', null=True, to=orm['hdabo.Tag'])), - ('abstract', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), - ('label', self.gf('django.db.models.fields.CharField')(max_length=2048, null=True, blank=True)), - ('thumbnail', self.gf('django.db.models.fields.URLField')(max_length=2048, null=True, blank=True)), - )) - db.send_create_signal('hdalab', ['DbpediaFields']) - - # Adding model 'TagLinks' - db.create_table('hdalab_taglinks', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('subject', self.gf('django.db.models.fields.related.ForeignKey')(related_name='taglinks_subjects', to=orm['hdabo.Tag'])), - ('object', self.gf('django.db.models.fields.related.ForeignKey')(related_name='taglinks_objects', to=orm['hdabo.Tag'])), - )) - db.send_create_signal('hdalab', ['TagLinks']) - - # Adding model 'CountryCode' - db.create_table('hdalab_countrycode', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('label', self.gf('django.db.models.fields.CharField')(unique=True, max_length=1024, db_index=True)), - ('isocode', self.gf('django.db.models.fields.CharField')(unique=True, max_length=3, db_index=True)), - )) - db.send_create_signal('hdalab', ['CountryCode']) - - # Adding model 'TagYears' - db.create_table('hdalab_tagyears', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('tag', self.gf('django.db.models.fields.related.ForeignKey')(related_name='years', to=orm['hdabo.Tag'])), - ('start_year', self.gf('django.db.models.fields.IntegerField')(db_index=True)), - ('end_yar', self.gf('django.db.models.fields.IntegerField')(db_index=True)), - )) - db.send_create_signal('hdalab', ['TagYears']) - - - def backwards(self, orm): - - # Deleting model 'DbpediaFields' - db.delete_table('hdalab_dbpediafields') - - # Deleting model 'TagLinks' - db.delete_table('hdalab_taglinks') - - # Deleting model 'CountryCode' - db.delete_table('hdalab_countrycode') - - # Deleting model 'TagYears' - db.delete_table('hdalab_tagyears') - - - models = { - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdalab.countrycode': { - 'Meta': {'object_name': 'CountryCode'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'isocode': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3', 'db_index': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024', 'db_index': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'dbpedia_fields'", 'null': 'True', 'to': "orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': "orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': "orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_yar': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - } - } - - complete_apps = ['hdalab'] diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0003_hdasession.py --- a/src/hdalab/migrations/0003_hdasession.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding model 'HdaSession' - db.create_table('hdalab_hdasession', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('sessionid', self.gf('django.db.models.fields.CharField')(unique=True, max_length=36, db_index=True)), - ('data', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), - )) - db.send_create_signal('hdalab', ['HdaSession']) - - - def backwards(self, orm): - - # Deleting model 'HdaSession' - db.delete_table('hdalab_hdasession') - - - models = { - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdalab.countrycode': { - 'Meta': {'object_name': 'CountryCode'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'isocode': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3', 'db_index': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024', 'db_index': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'dbpedia_fields'", 'null': 'True', 'to': "orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': "orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': "orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_yar': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - } - } - - complete_apps = ['hdalab'] diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0004_remove_dbpedia_unicity.py --- a/src/hdalab/migrations/0004_remove_dbpedia_unicity.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Removing unique constraint on 'DbpediaFields', fields ['dbpedia_uri'] - db.delete_unique('hdalab_dbpediafields', ['dbpedia_uri']) - - - def backwards(self, orm): - - # Adding unique constraint on 'DbpediaFields', fields ['dbpedia_uri'] - db.create_unique('hdalab_dbpediafields', ['dbpedia_uri']) - - - models = { - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdalab.countrycode': { - 'Meta': {'object_name': 'CountryCode'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'isocode': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3', 'db_index': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024', 'db_index': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'dbpedia_fields'", 'null': 'True', 'to': "orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': "orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': "orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_yar': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - } - } - - complete_apps = ['hdalab'] diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0005_rename_end_year.py --- a/src/hdalab/migrations/0005_rename_end_year.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,114 +0,0 @@ -# encoding: utf-8 -import 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 'TagYears.end_yar' - db.delete_column('hdalab_tagyears', 'end_yar') - - # Adding field 'TagYears.end_year' - db.add_column('hdalab_tagyears', 'end_year', self.gf('django.db.models.fields.IntegerField')(default=2012, db_index=True), keep_default=False) - - - def backwards(self, orm): - - # User chose to not deal with backwards NULL issues for 'TagYears.end_yar' - raise RuntimeError("Cannot reverse this migration. 'TagYears.end_yar' and its values cannot be restored.") - - # Deleting field 'TagYears.end_year' - db.delete_column('hdalab_tagyears', 'end_year') - - - models = { - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdalab.countrycode': { - 'Meta': {'object_name': 'CountryCode'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'isocode': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3', 'db_index': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024', 'db_index': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'dbpedia_fields'", 'null': 'True', 'to': "orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': "orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': "orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - } - } - - complete_apps = ['hdalab'] diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0006_dbpedia_fields_one_to_one.py --- a/src/hdalab/migrations/0006_dbpedia_fields_one_to_one.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,114 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'DbpediaFields.tag' - db.alter_column('hdalab_dbpediafields', 'tag_id', self.gf('django.db.models.fields.related.OneToOneField')(unique=True, null=True, to=orm['hdabo.Tag'])) - - # Adding unique constraint on 'DbpediaFields', fields ['tag'] - db.create_unique('hdalab_dbpediafields', ['tag_id']) - - - def backwards(self, orm): - - # Removing unique constraint on 'DbpediaFields', fields ['tag'] - db.delete_unique('hdalab_dbpediafields', ['tag_id']) - - # Changing field 'DbpediaFields.tag' - db.alter_column('hdalab_dbpediafields', 'tag_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['hdabo.Tag'])) - - - models = { - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdalab.countrycode': { - 'Meta': {'object_name': 'CountryCode'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'isocode': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3', 'db_index': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024', 'db_index': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'dbpedia_fields'", 'unique': 'True', 'null': 'True', 'to': "orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': "orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': "orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - } - } - - complete_apps = ['hdalab'] diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0007_geographic_inclusion.py --- a/src/hdalab/migrations/0007_geographic_inclusion.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,139 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Deleting model 'CountryCode' - db.delete_table('hdalab_countrycode') - - # Adding model 'GeoInclusion' - db.create_table('hdalab_geoinclusion', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('tag', self.gf('django.db.models.fields.related.OneToOneField')(related_name='locatedin', unique=True, to=orm['hdabo.Tag'])), - ('country', self.gf('django.db.models.fields.related.ForeignKey')(related_name='includes', to=orm['hdalab.Country'])), - )) - db.send_create_signal('hdalab', ['GeoInclusion']) - - # Adding model 'Country' - db.create_table('hdalab_country', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('dbpedia_uri', self.gf('django.db.models.fields.URLField')(unique=True, max_length=255, db_index=True)), - )) - db.send_create_signal('hdalab', ['Country']) - - - def backwards(self, orm): - - # Adding model 'CountryCode' - db.create_table('hdalab_countrycode', ( - ('isocode', self.gf('django.db.models.fields.CharField')(max_length=3, unique=True, db_index=True)), - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('label', self.gf('django.db.models.fields.CharField')(max_length=1024, unique=True, db_index=True)), - )) - db.send_create_signal('hdalab', ['CountryCode']) - - # Deleting model 'GeoInclusion' - db.delete_table('hdalab_geoinclusion') - - # Deleting model 'Country' - db.delete_table('hdalab_country') - - - models = { - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdalab.country': { - 'Meta': {'object_name': 'Country'}, - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'dbpedia_fields'", 'unique': 'True', 'null': 'True', 'to': "orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.geoinclusion': { - 'Meta': {'object_name': 'GeoInclusion'}, - 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'includes'", 'to': "orm['hdalab.Country']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'locatedin'", 'unique': 'True', 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': "orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': "orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - } - } - - complete_apps = ['hdalab'] diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0008_datasheet_insee.py --- a/src/hdalab/migrations/0008_datasheet_insee.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,304 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding model 'DatasheetExtras' - db.create_table('hdalab_datasheetextras', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('datasheet', self.gf('django.db.models.fields.related.OneToOneField')(related_name='extras', unique=True, to=orm['hdabo.Datasheet'])), - ('insee', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdalab.InseeCoords'], null=True, blank=True)), - )) - db.send_create_signal('hdalab', ['DatasheetExtras']) - - # Adding model 'InseeCoords' - db.create_table('hdalab_inseecoords', ( - ('insee', self.gf('django.db.models.fields.IntegerField')(primary_key=True)), - ('city_name', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('latitude', self.gf('django.db.models.fields.FloatField')()), - ('longitude', self.gf('django.db.models.fields.FloatField')()), - )) - db.send_create_signal('hdalab', ['InseeCoords']) - - - def backwards(self, orm): - - # Deleting model 'DatasheetExtras' - db.delete_table('hdalab_datasheetextras') - - # Deleting model 'InseeCoords' - db.delete_table('hdalab_inseecoords') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_themes']", 'to': "orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_domains']", 'to': "orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_themes']", 'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Organisation']"}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_themes']", 'to': "orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['hdabo.Tag']", 'through': "orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - 'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - 'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdalab.country': { - 'Meta': {'object_name': 'Country'}, - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'hdalab.datasheetextras': { - 'Meta': {'object_name': 'DatasheetExtras'}, - 'datasheet': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'extras'", 'unique': 'True', 'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.InseeCoords']", 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'dbpedia_fields'", 'unique': 'True', 'null': 'True', 'to': "orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.geoinclusion': { - 'Meta': {'object_name': 'GeoInclusion'}, - 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'includes'", 'to': "orm['hdalab.Country']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'locatedin'", 'unique': 'True', 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.inseecoords': { - 'Meta': {'object_name': 'InseeCoords'}, - 'city_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'insee': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}), - 'latitude': ('django.db.models.fields.FloatField', [], {}), - 'longitude': ('django.db.models.fields.FloatField', [], {}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': "orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': "orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - } - } - - complete_apps = ['hdalab'] diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0009_i18n.py --- a/src/hdalab/migrations/0009_i18n.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,308 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding model 'DbpediaFieldsTranslation' - db.create_table('hdalab_dbpediafieldstranslation', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('master', self.gf('django.db.models.fields.related.ForeignKey')(related_name='translations', to=orm['hdalab.DbpediaFields'])), - ('language_code', self.gf('django.db.models.fields.CharField')(max_length=15, db_index=True)), - ('label', self.gf('django.db.models.fields.CharField')(max_length=2048, blank=True)), - ('abstract', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), - )) - db.send_create_signal('hdalab', ['DbpediaFieldsTranslation']) - - # Adding unique constraint on 'DbpediaFieldsTranslation', fields ['master', 'language_code'] - db.create_unique('hdalab_dbpediafieldstranslation', ['master_id', 'language_code']) - - - def backwards(self, orm): - - # Removing unique constraint on 'DbpediaFieldsTranslation', fields ['master', 'language_code'] - db.delete_unique('hdalab_dbpediafieldstranslation', ['master_id', 'language_code']) - - # Deleting model 'DbpediaFieldsTranslation' - db.delete_table('hdalab_dbpediafieldstranslation') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 3, 8, 13, 47, 54, 155003)'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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(2012, 3, 8, 13, 47, 54, 154782)'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_themes']", 'to': "orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_domains']", 'to': "orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_themes']", 'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Organisation']"}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_themes']", 'to': "orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['hdabo.Tag']", 'through': "orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - 'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - 'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdalab.country': { - 'Meta': {'object_name': 'Country'}, - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'hdalab.datasheetextras': { - 'Meta': {'object_name': 'DatasheetExtras'}, - 'datasheet': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'extras'", 'unique': 'True', 'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.InseeCoords']", 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'dbpedia_fields'", 'unique': 'True', 'null': 'True', 'to': "orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafieldstranslation': { - 'Meta': {'unique_together': "(('master', 'language_code'),)", 'object_name': 'DbpediaFieldsTranslation'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}), - 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': "orm['hdalab.DbpediaFields']"}) - }, - 'hdalab.geoinclusion': { - 'Meta': {'object_name': 'GeoInclusion'}, - 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'includes'", 'to': "orm['hdalab.Country']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'locatedin'", 'unique': 'True', 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.inseecoords': { - 'Meta': {'object_name': 'InseeCoords'}, - 'city_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'insee': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}), - 'latitude': ('django.db.models.fields.FloatField', [], {}), - 'longitude': ('django.db.models.fields.FloatField', [], {}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': "orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': "orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - } - } - - complete_apps = ['hdalab'] diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0010_categoryinclusion.py --- a/src/hdalab/migrations/0010_categoryinclusion.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,312 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding model 'WpCategoryInclusion' - db.create_table('hdalab_wpcategoryinclusion', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('parent_category', self.gf('django.db.models.fields.related.ForeignKey')(related_name='child_categories', to=orm['hdalab.WpCategory'])), - ('child_category', self.gf('django.db.models.fields.related.ForeignKey')(related_name='parent_categories', to=orm['hdalab.WpCategory'])), - )) - db.send_create_signal('hdalab', ['WpCategoryInclusion']) - - # Adding unique constraint on 'WpCategoryInclusion', fields ['parent_category', 'child_category'] - db.create_unique('hdalab_wpcategoryinclusion', ['parent_category_id', 'child_category_id']) - - - def backwards(self, orm): - - # Removing unique constraint on 'WpCategoryInclusion', fields ['parent_category', 'child_category'] - db.delete_unique('hdalab_wpcategoryinclusion', ['parent_category_id', 'child_category_id']) - - # Deleting model 'WpCategoryInclusion' - db.delete_table('hdalab_wpcategoryinclusion') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 7, 2, 5, 14, 31, 895549)'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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(2012, 7, 2, 5, 14, 31, 895384)'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_themes']", 'to': "orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_domains']", 'to': "orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_themes']", 'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_themes']", 'to': "orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['hdabo.Tag']", 'through': "orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - 'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - 'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdalab.country': { - 'Meta': {'object_name': 'Country'}, - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'hdalab.datasheetextras': { - 'Meta': {'object_name': 'DatasheetExtras'}, - 'datasheet': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'extras'", 'unique': 'True', 'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.InseeCoords']", 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'dbpedia_fields'", 'unique': 'True', 'null': 'True', 'to': "orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafieldstranslation': { - 'Meta': {'unique_together': "(('master', 'language_code'),)", 'object_name': 'DbpediaFieldsTranslation'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}), - 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': "orm['hdalab.DbpediaFields']"}) - }, - 'hdalab.geoinclusion': { - 'Meta': {'object_name': 'GeoInclusion'}, - 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'includes'", 'to': "orm['hdalab.Country']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'locatedin'", 'unique': 'True', 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.inseecoords': { - 'Meta': {'object_name': 'InseeCoords'}, - 'city_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'insee': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}), - 'latitude': ('django.db.models.fields.FloatField', [], {}), - 'longitude': ('django.db.models.fields.FloatField', [], {}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': "orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': "orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - }, - 'hdalab.wpcategoryinclusion': { - 'Meta': {'unique_together': "(('parent_category', 'child_category'),)", 'object_name': 'WpCategoryInclusion'}, - 'child_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parent_categories'", 'to': "orm['hdalab.WpCategory']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'parent_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'child_categories'", 'to': "orm['hdalab.WpCategory']"}) - } - } - - complete_apps = ['hdalab'] diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0011_auto__add_field_dbpediafieldstranslation_is_label_translated__add_fiel.py --- a/src/hdalab/migrations/0011_auto__add_field_dbpediafieldstranslation_is_label_translated__add_fiel.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,309 +0,0 @@ -# encoding: utf-8 -import 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 'DbpediaFieldsTranslation.is_label_translated' - db.add_column('hdalab_dbpediafieldstranslation', 'is_label_translated', self.gf('django.db.models.fields.BooleanField')(default=True), keep_default=False) - - # Adding field 'DbpediaFieldsTranslation.is_abstract_translated' - db.add_column('hdalab_dbpediafieldstranslation', 'is_abstract_translated', self.gf('django.db.models.fields.BooleanField')(default=True), keep_default=False) - - - def backwards(self, orm): - - # Deleting field 'DbpediaFieldsTranslation.is_label_translated' - db.delete_column('hdalab_dbpediafieldstranslation', 'is_label_translated') - - # Deleting field 'DbpediaFieldsTranslation.is_abstract_translated' - db.delete_column('hdalab_dbpediafieldstranslation', 'is_abstract_translated') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 6, 7, 27, 20, 166066)'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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(2012, 9, 6, 7, 27, 20, 165955)'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - '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'}), - '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'}) - }, - 'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_college_themes']", 'to': "orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_domains']", 'to': "orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_highschool_themes']", 'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_periods']", 'to': "orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': "orm['hdabo.Datasheet_primary_themes']", 'to': "orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['hdabo.Tag']", 'through': "orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TimePeriod']"}) - }, - 'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Domain']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - 'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - 'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - 'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - 'hdalab.country': { - 'Meta': {'object_name': 'Country'}, - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'hdalab.datasheetextras': { - 'Meta': {'object_name': 'DatasheetExtras'}, - 'datasheet': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'extras'", 'unique': 'True', 'to': "orm['hdabo.Datasheet']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.InseeCoords']", 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'dbpedia_fields'", 'unique': 'True', 'null': 'True', 'to': "orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafieldstranslation': { - 'Meta': {'unique_together': "(('master', 'language_code'),)", 'object_name': 'DbpediaFieldsTranslation'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_abstract_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_label_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}), - 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': "orm['hdalab.DbpediaFields']"}) - }, - 'hdalab.geoinclusion': { - 'Meta': {'object_name': 'GeoInclusion'}, - 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'includes'", 'to': "orm['hdalab.Country']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'locatedin'", 'unique': 'True', 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.inseecoords': { - 'Meta': {'object_name': 'InseeCoords'}, - 'city_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'insee': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}), - 'latitude': ('django.db.models.fields.FloatField', [], {}), - 'longitude': ('django.db.models.fields.FloatField', [], {}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': "orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': "orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tags'", 'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'to': "orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - }, - 'hdalab.wpcategoryinclusion': { - 'Meta': {'unique_together': "(('parent_category', 'child_category'),)", 'object_name': 'WpCategoryInclusion'}, - 'child_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parent_categories'", 'to': "orm['hdalab.WpCategory']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'parent_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'child_categories'", 'to': "orm['hdalab.WpCategory']"}) - } - } - - complete_apps = ['hdalab'] diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0012_auto__add_hdalabrenkan.py --- a/src/hdalab/migrations/0012_auto__add_hdalabrenkan.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,328 +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): - - depends_on = ( - ("renkanmanager", "0001_initial"), - ) - - def forwards(self, orm): - # Adding model 'HdalabRenkan' - db.create_table(u'hdalab_hdalabrenkan', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('renkan', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['renkanmanager.Renkan'])), - ('state', self.gf('django.db.models.fields.IntegerField')(default=1)), - )) - db.send_create_signal('hdalab', ['HdalabRenkan']) - - - def backwards(self, orm): - # Deleting model 'HdalabRenkan' - db.delete_table(u'hdalab_hdalabrenkan') - - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'hdalab.country': { - 'Meta': {'object_name': 'Country'}, - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'hdalab.datasheetextras': { - 'Meta': {'object_name': 'DatasheetExtras'}, - 'datasheet': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'extras'", 'unique': 'True', 'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.InseeCoords']", 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'dbpedia_fields'", 'unique': 'True', 'null': 'True', 'to': u"orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafieldstranslation': { - 'Meta': {'unique_together': "(('master', 'language_code'),)", 'object_name': 'DbpediaFieldsTranslation'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_abstract_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_label_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}), - 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': "orm['hdalab.DbpediaFields']"}) - }, - 'hdalab.geoinclusion': { - 'Meta': {'object_name': 'GeoInclusion'}, - 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'includes'", 'to': "orm['hdalab.Country']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'locatedin'", 'unique': 'True', 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.hdalabrenkan': { - 'Meta': {'object_name': 'HdalabRenkan'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'renkan': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['renkanmanager.Renkan']"}), - 'state': ('django.db.models.fields.IntegerField', [], {'default': '1'}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.inseecoords': { - 'Meta': {'object_name': 'InseeCoords'}, - 'city_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'insee': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}), - 'latitude': ('django.db.models.fields.FloatField', [], {}), - 'longitude': ('django.db.models.fields.FloatField', [], {}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': u"orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': u"orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tags'", 'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - }, - 'hdalab.wpcategoryinclusion': { - 'Meta': {'unique_together': "(('parent_category', 'child_category'),)", 'object_name': 'WpCategoryInclusion'}, - 'child_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parent_categories'", 'to': "orm['hdalab.WpCategory']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'parent_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'child_categories'", 'to': "orm['hdalab.WpCategory']"}) - }, - 'renkanmanager.renkan': { - 'Meta': {'object_name': 'Renkan'}, - 'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'default': "'thumbnails/renkan/renkan_default_icon.png'", 'max_length': '100'}), - 'modification_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}), - 'rk_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}) - } - } - - complete_apps = ['hdalab'] \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0013_auto__chg_field_dbpediafields_tag__add_unique_tagyears_tag.py --- a/src/hdalab/migrations/0013_auto__chg_field_dbpediafields_tag__add_unique_tagyears_tag.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,327 +0,0 @@ -# -*- coding: utf-8 -*- -from south.db import db -from south.v2 import SchemaMigration - - -class Migration(SchemaMigration): - - depends_on = ( - ("hdabo", "0007_auto__add_folder"), - ) - - def forwards(self, orm): - - # Changing field 'DbpediaFields.tag' - db.alter_column(u'hdalab_dbpediafields', 'tag_id', self.gf('hdalab.fields.OneToOneField')(default=0, unique=True, related_default=lambda instance: None, to=orm['hdabo.Tag'])) - # Adding unique constraint on 'TagYears', fields ['tag'] - db.create_unique(u'hdalab_tagyears', ['tag_id']) - - - def backwards(self, orm): - # Removing unique constraint on 'TagYears', fields ['tag'] - db.delete_unique(u'hdalab_tagyears', ['tag_id']) - - - # Changing field 'DbpediaFields.tag' - db.alter_column(u'hdalab_dbpediafields', 'tag_id', self.gf('django.db.models.fields.related.OneToOneField')(unique=True, null=True, to=orm['hdabo.Tag'])) - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'hdalab.country': { - 'Meta': {'object_name': 'Country'}, - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'hdalab.datasheetextras': { - 'Meta': {'object_name': 'DatasheetExtras'}, - 'datasheet': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'extras'", 'unique': 'True', 'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.InseeCoords']", 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('hdalab.fields.OneToOneField', [], {'related_name': "'dbpedia_fields'", 'unique': 'True', 'related_default': 'None', 'to': u"orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafieldstranslation': { - 'Meta': {'unique_together': "(('master', 'language_code'),)", 'object_name': 'DbpediaFieldsTranslation'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_abstract_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_label_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}), - 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': "orm['hdalab.DbpediaFields']"}) - }, - 'hdalab.geoinclusion': { - 'Meta': {'object_name': 'GeoInclusion'}, - 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'includes'", 'to': "orm['hdalab.Country']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'locatedin'", 'unique': 'True', 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.hdalabrenkan': { - 'Meta': {'object_name': 'HdalabRenkan'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'renkan': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['renkanmanager.Renkan']"}), - 'state': ('django.db.models.fields.IntegerField', [], {'default': '1'}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.inseecoords': { - 'Meta': {'object_name': 'InseeCoords'}, - 'city_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'insee': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}), - 'latitude': ('django.db.models.fields.FloatField', [], {}), - 'longitude': ('django.db.models.fields.FloatField', [], {}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': u"orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': u"orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tags'", 'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'unique': 'True', 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - }, - 'hdalab.wpcategoryinclusion': { - 'Meta': {'unique_together': "(('parent_category', 'child_category'),)", 'object_name': 'WpCategoryInclusion'}, - 'child_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parent_categories'", 'to': "orm['hdalab.WpCategory']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'parent_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'child_categories'", 'to': "orm['hdalab.WpCategory']"}) - }, - 'renkanmanager.renkan': { - 'Meta': {'object_name': 'Renkan'}, - 'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'default': "'thumbnails/renkan/renkan_default_icon.png'", 'max_length': '100'}), - 'modification_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}), - 'rk_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}) - } - } - - complete_apps = ['hdalab'] \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0014_auto__add_hdalabrenkanstatetransition__chg_field_dbpediafields_tag.py --- a/src/hdalab/migrations/0014_auto__add_hdalabrenkanstatetransition__chg_field_dbpediafields_tag.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,339 +0,0 @@ -# -*- coding: utf-8 -*- -from south.db import db -from south.v2 import SchemaMigration - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'HdalabRenkanStateTransition' - db.create_table(u'hdalab_hdalabrenkanstatetransition', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('renkan', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdalab.HdalabRenkan'])), - ('from_state', self.gf('django.db.models.fields.IntegerField')(default=1)), - ('to_state', self.gf('django.db.models.fields.IntegerField')(default=1)), - ('ts', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('message', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), - ('author', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['hdabo.User'])), - )) - db.send_create_signal('hdalab', ['HdalabRenkanStateTransition']) - - def backwards(self, orm): - # Deleting model 'HdalabRenkanStateTransition' - db.delete_table(u'hdalab_hdalabrenkanstatetransition') - - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '7168', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'hdalab.country': { - 'Meta': {'object_name': 'Country'}, - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'hdalab.datasheetextras': { - 'Meta': {'object_name': 'DatasheetExtras'}, - 'datasheet': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'extras'", 'unique': 'True', 'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.InseeCoords']", 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('hdalab.fields.OneToOneField', [], {'related_name': "'dbpedia_fields'", 'unique': 'True', 'related_default': None, 'to': u"orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafieldstranslation': { - 'Meta': {'unique_together': "(('master', 'language_code'),)", 'object_name': 'DbpediaFieldsTranslation'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_abstract_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_label_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}), - 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': "orm['hdalab.DbpediaFields']"}) - }, - 'hdalab.geoinclusion': { - 'Meta': {'object_name': 'GeoInclusion'}, - 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'includes'", 'to': "orm['hdalab.Country']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'locatedin'", 'unique': 'True', 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.hdalabrenkan': { - 'Meta': {'object_name': 'HdalabRenkan'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'renkan': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['renkanmanager.Renkan']"}), - 'state': ('django.db.models.fields.IntegerField', [], {'default': '1'}) - }, - 'hdalab.hdalabrenkanstatetransition': { - 'Meta': {'object_name': 'HdalabRenkanStateTransition'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']"}), - 'from_state': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'renkan': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.HdalabRenkan']"}), - 'to_state': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'ts': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.inseecoords': { - 'Meta': {'object_name': 'InseeCoords'}, - 'city_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'insee': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}), - 'latitude': ('django.db.models.fields.FloatField', [], {}), - 'longitude': ('django.db.models.fields.FloatField', [], {}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': u"orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': u"orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tags'", 'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'unique': 'True', 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - }, - 'hdalab.wpcategoryinclusion': { - 'Meta': {'unique_together': "(('parent_category', 'child_category'),)", 'object_name': 'WpCategoryInclusion'}, - 'child_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parent_categories'", 'to': "orm['hdalab.WpCategory']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'parent_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'child_categories'", 'to': "orm['hdalab.WpCategory']"}) - }, - 'renkanmanager.renkan': { - 'Meta': {'object_name': 'Renkan'}, - 'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'default': "'thumbnails/renkan/renkan_default_icon.png'", 'max_length': '100'}), - 'modification_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}), - 'rk_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}) - } - } - - complete_apps = ['hdalab'] \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/migrations/0015_auto__add_field_hdalabrenkan_favorite.py --- a/src/hdalab/migrations/0015_auto__add_field_hdalabrenkan_favorite.py Tue Mar 24 12:16:06 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,336 +0,0 @@ -# -*- coding: utf-8 -*- -from south.db import db -from south.v2 import SchemaMigration - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding field 'HdalabRenkan.favorite' - db.add_column(u'hdalab_hdalabrenkan', 'favorite', - self.gf('django.db.models.fields.BooleanField')(default=False), - keep_default=False) - - - def backwards(self, orm): - - # Deleting field 'HdalabRenkan.favorite' - db.delete_column(u'hdalab_hdalabrenkan', 'favorite') - - - models = { - 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'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'hdabo.author': { - 'Meta': {'object_name': 'Author'}, - 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet': { - 'Meta': {'object_name': 'Datasheet'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Author']", 'null': 'True', 'blank': 'True'}), - 'college_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'college_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'college_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_college_themes']", 'to': u"orm['hdabo.Domain']"}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'domains': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_domains']", 'to': u"orm['hdabo.Domain']"}), - 'format': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.DocumentFormat']", 'null': 'True', 'blank': 'True'}), - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'highschool_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'highschool_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'highschool_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_highschool_themes']", 'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'manual_order': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'modification_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'organisation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Organisation']", 'null': 'True'}), - 'original_creation_date': ('django.db.models.fields.DateField', [], {}), - 'original_modification_date': ('django.db.models.fields.DateField', [], {}), - 'primary_periods': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_periods_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_periods']", 'to': u"orm['hdabo.TimePeriod']"}), - 'primary_themes': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'primary_themes_datasheets'", 'symmetrical': 'False', 'through': u"orm['hdabo.Datasheet_primary_themes']", 'to': u"orm['hdabo.Domain']"}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['hdabo.Tag']", 'through': u"orm['hdabo.TaggedSheet']", 'symmetrical': 'False'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'town': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Location']", 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), - 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.datasheet_college_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_college_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_college_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_domains': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_domains'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_highschool_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_highschool_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_highschool_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.datasheet_primary_periods': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_periods'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}), - 'timeperiod': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TimePeriod']"}) - }, - u'hdabo.datasheet_primary_themes': { - 'Meta': {'ordering': "['sort_value']", 'object_name': 'Datasheet_primary_themes'}, - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Domain']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sort_value': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.documentformat': { - 'Meta': {'object_name': 'DocumentFormat'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}) - }, - u'hdabo.domain': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'Domain'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.location': { - 'Meta': {'object_name': 'Location'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '5'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}) - }, - u'hdabo.organisation': { - 'Meta': {'object_name': 'Organisation'}, - 'hda_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'location': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'website': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tag': { - 'Meta': {'unique_together': "(('label', 'original_label', 'url_status'),)", 'object_name': 'Tag'}, - 'alias': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.TagCategory']", 'null': 'True', 'blank': 'True'}), - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '7168', 'db_index': 'True'}), - 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}), - 'original_label': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'popularity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), - 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), - 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - u'hdabo.tagcategory': { - 'Meta': {'object_name': 'TagCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}) - }, - u'hdabo.taggedsheet': { - 'Meta': {'object_name': 'TaggedSheet'}, - 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'datasheet': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'index_note': ('django.db.models.fields.FloatField', [], {'default': '0.0', 'db_index': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), - 'original_order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.Tag']"}), - 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - u'hdabo.timeperiod': { - 'Meta': {'unique_together': "(('label', 'school_period'),)", 'object_name': 'TimePeriod'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}), - 'natural_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'school_period': ('django.db.models.fields.IntegerField', [], {}) - }, - u'hdabo.user': { - 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - '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': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'hdalab.country': { - 'Meta': {'object_name': 'Country'}, - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'hdalab.datasheetextras': { - 'Meta': {'object_name': 'DatasheetExtras'}, - 'datasheet': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'extras'", 'unique': 'True', 'to': u"orm['hdabo.Datasheet']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'insee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.InseeCoords']", 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafields': { - 'Meta': {'object_name': 'DbpediaFields'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), - 'tag': ('hdalab.fields.OneToOneField', [], {'related_name': "'dbpedia_fields'", 'unique': 'True', 'related_default': None, 'to': u"orm['hdabo.Tag']"}), - 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) - }, - 'hdalab.dbpediafieldstranslation': { - 'Meta': {'unique_together': "(('master', 'language_code'),)", 'object_name': 'DbpediaFieldsTranslation'}, - 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_abstract_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_label_translated': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}), - 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), - 'master': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': "orm['hdalab.DbpediaFields']"}) - }, - 'hdalab.geoinclusion': { - 'Meta': {'object_name': 'GeoInclusion'}, - 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'includes'", 'to': "orm['hdalab.Country']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'locatedin'", 'unique': 'True', 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.hdalabrenkan': { - 'Meta': {'object_name': 'HdalabRenkan'}, - 'favorite': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'renkan': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['renkanmanager.Renkan']"}), - 'state': ('django.db.models.fields.IntegerField', [], {'default': '1'}) - }, - 'hdalab.hdalabrenkanstatetransition': { - 'Meta': {'object_name': 'HdalabRenkanStateTransition'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']"}), - 'from_state': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'renkan': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.HdalabRenkan']"}), - 'to_state': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'ts': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) - }, - 'hdalab.hdasession': { - 'Meta': {'object_name': 'HdaSession'}, - 'data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'sessionid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36', 'db_index': 'True'}) - }, - 'hdalab.infoboxparameter': { - 'Meta': {'unique_together': "(('tag_infobox', 'param_name'),)", 'object_name': 'InfoboxParameter'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'param_name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'param_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag_infobox': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hdalab.TagInfobox']"}) - }, - 'hdalab.inseecoords': { - 'Meta': {'object_name': 'InseeCoords'}, - 'city_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'insee': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}), - 'latitude': ('django.db.models.fields.FloatField', [], {}), - 'longitude': ('django.db.models.fields.FloatField', [], {}) - }, - 'hdalab.taginfobox': { - 'Meta': {'unique_together': "(('tag', 'name', 'revision_id'),)", 'object_name': 'TagInfobox'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '2048'}), - 'revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}), - 'source': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'infoboxes'", 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.taglinks': { - 'Meta': {'object_name': 'TagLinks'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_objects'", 'to': u"orm['hdabo.Tag']"}), - 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taglinks_subjects'", 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.tagwpcategory': { - 'Meta': {'unique_together': "(('tag', 'wp_category', 'hidden'),)", 'object_name': 'TagWpCategory'}, - 'hidden': ('django.db.models.fields.BooleanField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wp_categories'", 'to': u"orm['hdabo.Tag']"}), - 'wp_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tags'", 'to': "orm['hdalab.WpCategory']"}) - }, - 'hdalab.tagyears': { - 'Meta': {'object_name': 'TagYears'}, - 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'unique': 'True', 'to': u"orm['hdabo.Tag']"}) - }, - 'hdalab.wpcategory': { - 'Meta': {'object_name': 'WpCategory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}) - }, - 'hdalab.wpcategoryinclusion': { - 'Meta': {'unique_together': "(('parent_category', 'child_category'),)", 'object_name': 'WpCategoryInclusion'}, - 'child_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parent_categories'", 'to': "orm['hdalab.WpCategory']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'parent_category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'child_categories'", 'to': "orm['hdalab.WpCategory']"}) - }, - 'renkanmanager.renkan': { - 'Meta': {'object_name': 'Renkan'}, - 'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.files.ImageField', [], {'default': "'thumbnails/renkan/renkan_default_icon.png'", 'max_length': '100'}), - 'modification_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['hdabo.User']", 'null': 'True', 'blank': 'True'}), - 'rk_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '1024'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}) - } - } - - complete_apps = ['hdalab'] \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/models/__init__.py --- a/src/hdalab/models/__init__.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/models/__init__.py Tue Mar 24 12:24:28 2015 +0100 @@ -4,5 +4,3 @@ from hdalab.models.renkan import HdalabRenkan, HdalabRenkanStateTransition __all__ = ['WpCategory', 'InfoboxParameter', 'TagInfobox', 'TagWpCategory', 'TagYears', 'Country', 'GeoInclusion', 'TagLinks', 'DbpediaFields', 'DbpediaFieldsTranslation', 'HdaSession', 'InseeCoords', 'DatasheetExtras', 'WpCategoryInclusion', 'HdalabRenkan', 'HdalabRenkanStateTransition'] - -import hdalab.signals \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/models/categories.py --- a/src/hdalab/models/categories.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/models/categories.py Tue Mar 24 12:24:28 2015 +0100 @@ -20,7 +20,7 @@ class TagWpCategory(models.Model): tag = models.ForeignKey(Tag, related_name="wp_categories") wp_category = models.ForeignKey(WpCategory, related_name="tags") - hidden = models.BooleanField(blank=False, null=False) + hidden = models.BooleanField(blank=False, null=False, default=False) class Meta: app_label = 'hdalab' diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/models/renkan.py --- a/src/hdalab/models/renkan.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/models/renkan.py Tue Mar 24 12:24:28 2015 +0100 @@ -9,7 +9,7 @@ from django.conf import settings from django.db import models -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ logger = logging.getLogger(__name__) diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/settings.py --- a/src/hdalab/settings.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/settings.py Tue Mar 24 12:24:28 2015 +0100 @@ -138,7 +138,6 @@ ) INSTALLED_APPS = ( - 'south', 'hdalab', 'hdabo', 'django.contrib.auth', @@ -173,6 +172,8 @@ PAGINATION_DEFAULT_NB_BY_PAGE = 50 RENKANS_PER_PAGE = 8 +TEST_RUNNER = 'django.test.runner.DiscoverRunner' + # User class after migration to django > 1.6.5 AUTH_USER_MODEL = 'hdabo.User' diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/static/hdalab/css/login.css --- a/src/hdalab/static/hdalab/css/login.css Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/static/hdalab/css/login.css Tue Mar 24 12:24:28 2015 +0100 @@ -14,4 +14,8 @@ .ui-dialog .ui-dialog-content { padding:0; +} + +div.register > p { + font-size: 1.4rem; } \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/static/hdalab/js/gomina.js --- a/src/hdalab/static/hdalab/js/gomina.js Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/static/hdalab/js/gomina.js Tue Mar 24 12:24:28 2015 +0100 @@ -120,7 +120,6 @@ _curView[_type].push(_label); } updateFilters(); - //debouncedSaveChanges(); } } @@ -129,7 +128,6 @@ if (_curView.type == 'filter') { _curView[_type].splice(_index,1); updateFilters(); - //debouncedSaveChanges(); } } @@ -162,7 +160,6 @@ _curView.period[_n] = _int; } updateFilters(); - //debouncedSaveChanges(); } } } @@ -173,7 +170,6 @@ _curView.period[0] = gomNs.minYear; _curView.period[1] = gomNs.maxYear; updateFilters(); - //debouncedSaveChanges(); } } @@ -314,78 +310,47 @@ + ' placeholder' + ''; }).join('') - /*+ '

'+gettext("Annotations")+'

' - + ( gomNs.sessiondata.annotations[_d.id] && gomNs.sessiondata.annotations[_d.id].texte - ? '
  • ' - + _.escape(gomNs.sessiondata.annotations[_d.id].texte).replace(/\n/gm,"
  • ") - + '
    • ' - : ( gomNs.write_allowed ? '
    • '+gettext("Annoter ce contenu")+'...
    ' : '' ) )*/ + '
'; - /*if (gomNs.write_allowed) { - _(gomNs.sessiondata.views).each(function(_view, _k) { - if (_view.type == 'list') { - _html += '

' - + str_format(( _view.list.indexOf(_d.id) == -1 ? gettext('Ajouter a {0}') : gettext('Retirer de {0}') ),'"'+ _.escape(_view.name)+ '"') - + '

' - } - }); - }*/ _html += ''; return _html; }).join('') + ''; $("#contents").html(_htmlCl).scrollTop(0); - /*$("a.addremlist").click(function() { - var _id = $(this).attr("contentid"), - _vid = - _view = gomNs.sessiondata.views[$(this).attr("viewid")], - _io = _view.list.indexOf(_id); - if ( _io == -1) { - _view.list.push(_id); - $(this).html(str_format(gettext('Retirer de {0}'),'"' + _.escape(_view.name) + '"' )); - } else { - _view.list.splice(_io, 1); - $(this).html(str_format(gettext('Ajouter a {0}'),'"' + _.escape(_view.name) + '"')); - } - if (gomNs.sessiondata.view == 1) { - showView(); - } - debouncedSaveChanges(); - return false; - });*/ - /*if (gomNs.write_allowed) { - $("div.content-annotation").click(function() { - if (this.children[0].tagName == 'UL') { - var _el = document.createElement('textarea'), - _id = $(this).attr("contentid"); - _el.innerHTML = (gomNs.sessiondata.annotations[_id] && gomNs.sessiondata.annotations[_id].texte) ? gomNs.sessiondata.annotations[_id].texte : ''; - $(_el).focusout(function() { - var _id = this.parentNode.attributes.contentid.nodeValue; - if (!gomNs.sessiondata.annotations[_id]) { - gomNs.sessiondata.annotations[_id] = {}; - } - gomNs.sessiondata.annotations[_id].texte = this.value; - this.parentNode.innerHTML = '
  • ' + (this.value.length ? _.escape(gomNs.sessiondata.annotations[_id].texte).replace(/\n/gm,"
  • ") : gettext('Annoter ce contenu')+'...' ) + '
'; - debouncedSaveChanges(); - }); - $(this).html(_el); - _el.focus(); - _el.select(); - } - }); - }*/ + } else { $("#contents").html(""); } } +function updateMap() { + if (gomNs.countries && gomNs.filterCountries) { + var _max = Math.max(1, _(gomNs.filterCountries).max()); + _(gomNs.countries).each(function(_country, _k) { + _k = decodeURIComponent(_k); + var _val = gomNs.filterCountries[_k] || 0, + _fill = getGradient(_val/_max); + switch(gomNs.mappingLibrary) { + case 'gmaps': + _(_country.gPolygons).each(function(_p) { + _p.setOptions({ + "fillColor" : _fill, + "fillOpacity" : 1 + }); + }); + break; + case 'leaflet': + _country.layer.setStyle({ + "fillColor" : _fill, + "fillOpacity" : 1 + }) + break; + } + }); + } +} + + function updateDisplay(data) { animStop(); @@ -451,29 +416,9 @@ $("#tagcloud").html("

Pas de mots-clés trouvés

"); } displayContents(data.contents); - if (gomNs.countries && data.countries) { - var _max = Math.max(1, _(data.countries).max()); - _(gomNs.countries).each(function(_country, _k) { - _k = decodeURIComponent(_k); - var _val = data.countries[_k] || 0, - _fill = getGradient(_val/_max); - switch(gomNs.mappingLibrary) { - case 'gmaps': - _(_country.gPolygons).each(function(_p) { - _p.setOptions({ - "fillColor" : _fill, - "fillOpacity" : 1 - }); - }); - break; - case 'leaflet': - _country.layer.setStyle({ - "fillColor" : _fill, - "fillOpacity" : 1 - }) - break; - } - }); + if(data.countries) { + gomNs.filterCountries = data.countries; + $("#map").trigger('mapUpdate.gomina'); } if (data.disciplines) { var _disc = data.disciplines.filter(function(_d) { @@ -502,28 +447,6 @@ } } -/*function saveChanges() { - if (gomNs.sessionid && gomNs.sessionkey) { - $.getJSON(gomNs.urls['session_info'], { - "sessionid" : gomNs.sessionid, - "sessionkey" : gomNs.sessionkey, - "data" : JSON.stringify(gomNs.sessiondata), - }); - } -}*/ - -//var debouncedSaveChanges = _.debounce(saveChanges, 3000); - -/*function changeView(nview) { - var _curView = gomNs.sessiondata.views[nview]; - if (_curView.type == 'list' && (!_curView.list || !_curView.list.length)) { - alert(gettext("La liste de contenus est vide ! Ajoutez des contenus pour afficher la liste !")); - } else { - gomNs.sessiondata.view = nview; - debouncedSaveChanges(); - showView(); - } -}*/ function showView(initial) { if(typeof initial==="undefined"){ @@ -558,18 +481,6 @@ } } -/*function displayViewList() { - $("#ongletsvues").html(gomNs.sessiondata.views.map(function(_v, _k) { - return '
  • ' - + _.escape(_v.name) - + '
    • '; - }).join("")) -}*/ - function getURLParameter(name) { return decodeURI( @@ -626,76 +537,14 @@ } }; - /*gomNs.sessionid = data.sessionid; - if (data.sessionkey) { - gomNs.sessionkey = data.sessionkey; - } - gomNs.write_allowed = data.write_allowed; - if (data.write_allowed) { - $("#partagerw").show(); - } else { - $("#partagerw").hide(); - }*/ - //var _baseUrl = document.location.href.split("#")[0]; - //gomNs.hash = "#" + data.sessionid + (data.sessionkey ? (':' + data.sessionkey) : ''); - //document.location.hash = gomNs.hash; gomNs.sessiondata = typeof data.data == "string" ? JSON.parse(data.data) : (typeof data.data == "object" ? data.data : {}); - /*if (!gomNs.sessiondata.title) { - gomNs.sessiondata.title = gettext('Nouvelle session'); - }*/ + if (!gomNs.sessiondata.views) { gomNs.sessiondata.views = []; } - /*if (!gomNs.sessiondata.views.length) { - addView( 'filter', gettext('Mes resultats de recherche') ); - addView( 'list', gettext('Ma liste') ); - } - if (!gomNs.sessiondata.annotations) { - gomNs.sessiondata.annotations = {}; - } - if (data.write_allowed) { - $("#bloc_gestvue").show(); - } else { - $("#bloc_gestvue").hide(); - } - $("#sessionname").html(_.escape(gomNs.sessiondata.title) - + ( data.write_allowed ? '' : ' ('+gettext("lecture seule")+')' ) ); - gomNs.hrefinterval = setInterval(function() { - if (document.location.hash != gomNs.hash) { - clearInterval(gomNs.hrefinterval); - getInitialView(); - } - }, 500);*/ - //displayViewList(); showView(true); } -/*function changeSessionTitle(title) { - gomNs.sessiondata.title = title; - $("#sessionname").html(_.escape(gomNs.sessiondata.title)); - debouncedSaveChanges(); -}*/ - -/*function addView(viewtype, viewname) { - var _content = { - type: viewtype, - name: viewname, - hiddenWidgets: [], - }; - switch(viewtype) { - case 'filter': - _content.period = [ gomNs.minYear, gomNs.maxYear ]; - _content.tag = []; - _content.country = []; - gomNs.sessiondata.view = gomNs.sessiondata.views.length; - break; - case 'list': - _content.list = []; - break; - } - gomNs.sessiondata.views.push(_content); - debouncedSaveChanges(); -}*/ function animLoad() { var _d = $("#waiting"), @@ -746,6 +595,7 @@ ); $(document).ready(function() { + var showMethod; switch(gomNs.mappingLibrary) { case 'gmaps': gomNs.map = new google.maps.Map(document.getElementById("map"), @@ -754,7 +604,7 @@ zoom: 1, mapTypeId: google.maps.MapTypeId.SATELLITE }); - $.getJSON(gomNs.urls['countries'], showCountriesGmap); + showMethod = showCountriesGmap; break; case 'leaflet': gomNs.map = new L.Map('map', { @@ -765,9 +615,15 @@ }); gomNs.map.addControl(new L.Control.ZoomMin()) //gomNs.map.addLayer(new L.TileLayer("http://s3.amazonaws.com/com.modestmaps.bluemarble/{z}-r{y}-c{x}.jpg", {maxZoom: 9})); - $.getJSON(gomNs.urls['countries'], showCountriesLeaflet); + showMethod = showCountriesLeaflet; break; } + $("#map").on('mapUpdate.gomina', updateMap); + $.getJSON(gomNs.urls['countries'], function(geoJson) { + showMethod(geoJson); + $("#map").trigger('mapUpdate.gomina'); + }); + var _html = gomNs.displayedDates.map(function(_v) { return '
  • ") : gettext('Annoter cette vue')+'...' ) + ''; - debouncedSaveChanges(); - }); - $(this).html(_el); - _el.focus(); - _el.select(); - } - } - });*/ + getInitialView(); $(".barrebloc").click(function() { $(this).next().slideToggle(); @@ -895,42 +670,8 @@ + '" />
    • ' }); _html + ''; - /*$("#gestvue").append(_html); - $("#nouvellevue").click(function() { - $("#plusdevues").slideToggle(); - return false; - }) - $("#widgetlist input").change(function() { - var _newWL = []; - $("#widgetlist input").each(function(_k, _e) { - var _id = _e.id.substr(5); - if (!$(_e).prop("checked")) { - $("#" + _id).hide(); - _newWL.push(_id); - } else { - $("#" + _id).show(); - } - }); - gomNs.sessiondata.views[gomNs.sessiondata.view].hiddenWidgets = _newWL; - debouncedSaveChanges(); - }); - $("#nouv_resrech").click(function() { - var _txt = prompt(gettext("Comment souhaitez-vous nommer votre nouvelle vue ?"),gettext("Nouveaux resultats de recherche")); - if (_txt !== null) { - addView('filter', _txt); - displayViewList(); - } - return false; - }); - $("#nouv_liste").click(function() { - var _txt = prompt(gettext("Comment souhaitez-vous nommer votre nouvelle vue ?"),gettext("Nouvelle liste")); - if (_txt !== null) { - addView('list', _txt); - displayViewList(); - } - return false; - });*/ - $(" #tagform ").submit(function() { + + $(" #tagform ").submit(function() { return false; }); var cache = {}, /*CACHE => http://jqueryui.com/demos/autocomplete/#remote-with-cache */ diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/templates/400.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/templates/400.html Tue Mar 24 12:24:28 2015 +0100 @@ -0,0 +1,20 @@ +{% extends "base.html" %} +{% load i18n %} +{% load static %} + + +{% block title %}{{block.super}} > {% trans 'Bad request' %}{% endblock %} + +{% block css_import %} +{{block.super}} + +{% endblock %} + +{% block main_content %} +
    +

    {% trans 'Bad request' %}

    +
    +
    +

    {% trans 'Sorry, you sent a bad request.' %}

    +
    +{% endblock %} \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/templates/404.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/templates/404.html Tue Mar 24 12:24:28 2015 +0100 @@ -0,0 +1,20 @@ +{% extends "base.html" %} +{% load i18n %} +{% load static %} + + +{% block title %}{{block.super}} > {% trans 'Page not found' %}{% endblock %} + +{% block css_import %} +{{block.super}} + +{% endblock %} + +{% block main_content %} +
    +

    {% trans 'Page not found' %}

    +
    +
    +

    {% trans 'Sorry, but the requested page could not be found.' %}

    +
    +{% endblock %} \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/templates/500.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/templates/500.html Tue Mar 24 12:24:28 2015 +0100 @@ -0,0 +1,86 @@ +{# -*- coding: utf-8 -*- #} +{% load static %} + + + + + + + + + HdA Lab > Erreur d'application + + + + + + + + + + + +
    + +
    +

    Erreur Applicative

    +
    +
    +

    Désolé mais votre requête n'a pas pu être traitée par notre site.

    +
    +
    + + + + + + diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/templates/base.html --- a/src/hdalab/templates/base.html Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/templates/base.html Tue Mar 24 12:24:28 2015 +0100 @@ -6,10 +6,10 @@ - + - + {% block title %}HdA Lab{% endblock %} {% block css_import %} diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/templates/mails/rejected_renkan.html --- a/src/hdalab/templates/mails/rejected_renkan.html Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/templates/mails/rejected_renkan.html Tue Mar 24 12:24:28 2015 +0100 @@ -28,7 +28,7 @@ {% endif %}

    Votre Renkan n'est pas effacé.

    -

    Vous le retrouverez dans votre espace personnel : {% url 'profile_home' %}.

    +

    Vous le retrouverez dans votre espace personnel : {{WEB_URL}}{% url 'profile_home' %}.


    Cordialement,


    diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/templates/mails/rejected_renkan.txt --- a/src/hdalab/templates/mails/rejected_renkan.txt Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/templates/mails/rejected_renkan.txt Tue Mar 24 12:24:28 2015 +0100 @@ -6,7 +6,7 @@ {% endif %} Votre Renkan n'est pas effacé. -Vous le retrouverez dans votre espace personnel : {% url 'profile_home' %} +Vous le retrouverez dans votre espace personnel : {{WEB_URL}}{% url 'profile_home' %} Cordialement, diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/templates/mails/unpublished_renkan.html --- a/src/hdalab/templates/mails/unpublished_renkan.html Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/templates/mails/unpublished_renkan.html Tue Mar 24 12:24:28 2015 +0100 @@ -28,7 +28,7 @@ {% endif %}

    Votre Renkan n'est pas effacé.

    -

    Vous le retrouverez dans votre espace personnel : {% url 'profile_home' %}.

    +

    Vous le retrouverez dans votre espace personnel : {{WEB_URL}}{% url 'profile_home' %}.


    Cordialement,


    diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/templates/mails/unpublished_renkan.txt --- a/src/hdalab/templates/mails/unpublished_renkan.txt Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/templates/mails/unpublished_renkan.txt Tue Mar 24 12:24:28 2015 +0100 @@ -5,7 +5,7 @@ {% endif %} Votre Renkan n'est pas effacé. -Vous le retrouverez dans votre espace personnel : {% url 'profile_home' %}. +Vous le retrouverez dans votre espace personnel : {{WEB_URL}}{% url 'profile_home' %}. Cordialement, diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/templates/registration/password_change_form.html --- a/src/hdalab/templates/registration/password_change_form.html Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/templates/registration/password_change_form.html Tue Mar 24 12:24:28 2015 +0100 @@ -7,10 +7,11 @@ {% block css_import %} {{block.super}} + {% endblock %} {% block main_content %} -
    +

    {% trans "Changer le mot de passe" %}

    {% csrf_token %} diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/templates/registration/password_reset_form.html --- a/src/hdalab/templates/registration/password_reset_form.html Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/templates/registration/password_reset_form.html Tue Mar 24 12:24:28 2015 +0100 @@ -7,12 +7,13 @@ {% block css_import %} {{block.super}} + {% endblock %} {% block login_actif %}actif{% endblock %} {% block main_content %} -
    +

    {% trans "Recuperation du Mot de Passe" %}

    {% if form.errors %}

    {% trans "Sorry, that's not a valid username or password." %}

    diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/urls.py --- a/src/hdalab/urls.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/urls.py Tue Mar 24 12:24:28 2015 +0100 @@ -1,14 +1,19 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url +from django.contrib.admin.views.decorators import staff_member_required +from django.contrib.auth.decorators import login_required from django.views.generic import TemplateView -from hdalab.views.profile import ProfileHome, RenkanEdit, HdalabRenkanGetPut,\ - RenkanNew, RenkanPublicList, HdalabRenkanCopy, HdalabRenkanDelete,\ - HdalabRenkanModerate, HdalabRenkanFavorite, RenkanFavoriteList,\ + +from hdalab.views import server_error +from hdalab.views.editorial import HdalabFolders, HdalabAddOrUpdateFolder, \ + HdalabDeleteFolder, ManageRenkans +from hdalab.views.profile import ProfileHome, RenkanEdit, HdalabRenkanGetPut, \ + RenkanNew, RenkanPublicList, HdalabRenkanCopy, HdalabRenkanDelete, \ + HdalabRenkanModerate, HdalabRenkanFavorite, RenkanFavoriteList, \ UserProfileUpdate -from django.contrib.auth.decorators import login_required -from django.contrib.admin.views.decorators import staff_member_required -from hdalab.views.editorial import HdalabFolders, HdalabAddOrUpdateFolder,\ - HdalabDeleteFolder, ManageRenkans + + +handler500 = server_error # Uncomment the next two lines to enable the admin: # from django.contrib import admin diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/views/__init__.py --- a/src/hdalab/views/__init__.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/views/__init__.py Tue Mar 24 12:24:28 2015 +0100 @@ -0,0 +1,18 @@ + +import logging +import sys + +from django.conf import settings +from django.shortcuts import render + +logger = logging.getLogger(__name__) + +def server_error(request): + response = None + try: + response = render(request, '500.html', {'base_url': settings.BASE_URL}) + except: + import traceback + logger.error("server_error %s : %s", sys.exc_info()[0], traceback.format_exc()) + response.status_code = 500 + return response \ No newline at end of file diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/views/ajax.py --- a/src/hdalab/views/ajax.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/views/ajax.py Tue Mar 24 12:24:28 2015 +0100 @@ -28,7 +28,7 @@ labels = request.GET.get('labels',None) if not labels: - return HttpResponse(content=json.dumps({}), mimetype='application/json') + return HttpResponse(content=json.dumps({}), content_type='application/json') labelslist = [lbl.strip() for lbl in labels.split(",")] masters = [] @@ -44,7 +44,7 @@ translations = dict([(t.master.label, t.label) for t in translationqs]) - return HttpResponse(content=json.dumps(translations), mimetype='application/json') + return HttpResponse(content=json.dumps(translations), content_type='application/json') def subcat(category, globtags, level, max_level ): # recursive function used by cattree @@ -130,7 +130,7 @@ }) cleantags(resobj) - return HttpResponse(content=json.dumps(resobj), mimetype='application/json') + return HttpResponse(content=json.dumps(resobj), content_type='application/json') def sessioninfo(request): @@ -170,7 +170,7 @@ if write: resobj['sessionkey'] = request.session['sessionkey'] - return HttpResponse(content=json.dumps(resobj), mimetype='application/json') + return HttpResponse(content=json.dumps(resobj), content_type='application/json') def tagsearch(request): @@ -236,7 +236,7 @@ if q is None or resobj['value'].lower().find(lq) != -1: res.append(resobj) - return HttpResponse(content=json.dumps(res), mimetype='application/json') + return HttpResponse(content=json.dumps(res), content_type='application/json') def catsearch(request): @@ -252,7 +252,7 @@ res = [{'value':t.label} for t in qs] - return HttpResponse(content=json.dumps(res), mimetype='application/json') + return HttpResponse(content=json.dumps(res), content_type='application/json') def filter(request): @@ -267,7 +267,7 @@ outputstr = filter_generic(lang, periode, label, country, contentlist, max_tag_order, content_count, tag_count) - return HttpResponse(content=outputstr, mimetype='application/json') + return HttpResponse(content=outputstr, content_type='application/json') def filter_generic(lang="fr-fr", periode=None, label=None, country=None, contentlist=None, max_tag_order=12, content_count=8, tag_count=30): @@ -490,4 +490,4 @@ res = subtree(treeobj) - return HttpResponse(content=json.dumps(res), mimetype='application/json') + return HttpResponse(content=json.dumps(res), content_type='application/json') diff -r 03d4200ae809 -r 92b01b214192 src/hdalab/views/profile.py --- a/src/hdalab/views/profile.py Tue Mar 24 12:16:06 2015 +0100 +++ b/src/hdalab/views/profile.py Tue Mar 24 12:24:28 2015 +0100 @@ -8,14 +8,11 @@ from datetime import datetime import json import logging -from renkanmanager.models import Renkan -from renkanmanager.utils import LineNodePlacer, HorLineNodePlacer, renkan_copier, renkan_deleter, \ - CircleNodePlacer +from renkanmanager.views import RenkanGetPut import uuid from django.conf import settings -from django.contrib.auth import REDIRECT_FIELD_NAME, login as auth_login, \ - get_user_model +from django.contrib.auth import REDIRECT_FIELD_NAME, login as auth_login from django.contrib.auth.forms import AuthenticationForm from django.contrib.sites.models import get_current_site from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage @@ -35,7 +32,9 @@ from django.views.decorators.debug import sensitive_post_parameters from django.views.generic import TemplateView, View from django.views.generic.edit import UpdateView -from renkanmanager.views import RenkanGetPut +from renkanmanager.models import Renkan +from renkanmanager.utils import LineNodePlacer, HorLineNodePlacer, renkan_copier, renkan_deleter, \ + CircleNodePlacer from hdabo.models import Tag, Datasheet, TaggedSheet, Folder from hdalab.forms import HdalabRenkanStateForm, HdalabRenkanFavoriteForm @@ -45,8 +44,6 @@ from hdalab.views.ajax import filter_generic -User = get_user_model() - logger = logging.getLogger(__name__) @@ -700,7 +697,6 @@ class UserProfileUpdate(UpdateView): - model = User fields = ['email'] template_name_suffix = '_update_form' diff -r 03d4200ae809 -r 92b01b214192 src/requirement.txt --- a/src/requirement.txt Tue Mar 24 12:16:06 2015 +0100 +++ b/src/requirement.txt Tue Mar 24 12:24:28 2015 +0100 @@ -1,1 +1,1 @@ -renkanmanager (==0.8.4) +renkanmanager (==0.8.6) diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Tue Mar 24 12:16:06 2015 +0100 +++ b/virtualenv/res/lib/lib_create_env.py Tue Mar 24 12:24:28 2015 +0100 @@ -17,30 +17,29 @@ URLS = { #'': {'setup': '', 'url':'', 'local':''}, 'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz', 'local':"distribute-0.6.24.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'DJANGO': {'setup': 'django', 'url': 'https://www.djangoproject.com/download/1.6.8/tarball/', 'local':"Django-1.6.8.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/archive/1.4.4.tar.gz', 'local':"django-extensions-1.4.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DJANGO': {'setup': 'django', 'url': 'https://www.djangoproject.com/download/1.7.6/tarball/', 'local':"Django-1.7.6.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/archive/1.5.1.tar.gz', 'local':"django-extensions-1.5.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'REGISTRATION': { 'setup': 'django-registration', 'url':'https://github.com/macropin/django-registration/archive/v1.1.tar.gz', 'local':"django-registration-1.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'HTTPLIB2': { 'setup': 'httplib2', 'url':'https://github.com/jcgregorio/httplib2/archive/v0.9.tar.gz', 'local':"httplib2-0.7.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'SOUTH': { 'setup': 'South', 'url':'http://www.aeracode.org/releases/south/south-1.0.1.tar.gz', 'local':"South-1.0.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'PYCRYPTO': {'setup': 'pycrypto', 'url':'https://github.com/dlitz/pycrypto/archive/v2.6.1.tar.gz', 'local':'pycrypto-2.6.1.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'SSH': {'setup': 'ssh', 'url':'http://pypi.python.org/packages/source/s/ssh/ssh-1.7.14.tar.gz#md5=4cdd0549ef4699bd67b96264d3b21427', 'local':'ssh-1.7.14.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'FABRIC': {'setup': 'fabric', 'url':'https://github.com/fabric/fabric/tarball/1.4.2', 'local':'fabric-1.4.2.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'MERCURIAL': {'setup': 'mercurial', 'url':'http://mercurial.selenic.com/release/mercurial-2.2.3.tar.gz', 'local':'mercurial-2.2.3.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'HAYSTACK': {'setup': 'django-haystack', 'url': 'https://github.com/toastdriven/django-haystack/archive/v2.2.0.tar.gz', 'local': 'django-haystack-2.2.0.tar.gz', 'install':{'method':'pip', 'option_str': None, 'dict_extra_env': None}}, - 'WHOOSH': {'setup': 'whoosh', 'url':'https://pypi.python.org/packages/source/W/Whoosh/Whoosh-2.5.7.tar.gz', 'local':'whoosh-2.5.7.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'HAYSTACK': {'setup': 'django-haystack', 'url': 'https://github.com/django-haystack/django-haystack/archive/v2.3.1.tar.gz', 'local': 'django-haystack-2.3.1.tar.gz', 'install':{'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'WHOOSH': {'setup': 'whoosh', 'url':'https://pypi.python.org/packages/source/W/Whoosh/Whoosh-2.6.0.zip', 'local':'Whoosh-2.6.0.zip', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, 'WIKITOOLS' : { 'setup': 'wikitools', 'url': 'https://github.com/alexz-enwp/wikitools/archive/1.2.tar.gz', 'local': 'wikitools-1.2.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'ISODATE' : {'setup': 'isodate', 'url': 'http://pypi.python.org/packages/source/i/isodate/isodate-0.5.1.tar.gz', 'local': 'isodate-0.5.1.tar.gz', 'install' : {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'RDFLIB' : { 'setup': 'rdflib', 'url': 'https://github.com/IRI-Research/rdflib/archive/30f0f8ca7dba3e9dbfef39fb2006e4b395748f6c.tar.gz', 'local': 'rdflib-4.2.0-dev.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'SPARQLWRAPPER' : { 'setup': 'SPARQLWrapper', 'url': 'https://github.com/RDFLib/sparqlwrapper/archive/1.6.4.tar.gz', 'local' : 'SPARQLWrapper-1.6.4.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'REQUESTS' : { 'setup': 'requests', 'url': 'https://github.com/kennethreitz/requests/archive/v2.4.3.tar.gz', 'local' : 'requests-2.4.3.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'ELASTICSEARCH' : { 'setup': 'elasticsearch', 'url': 'https://github.com/elasticsearch/elasticsearch-py/archive/1.2.0.tar.gz', 'local' : 'elasticsearch-1.2.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'REQUESTS' : { 'setup': 'requests', 'url': 'https://github.com/kennethreitz/requests/archive/v2.6.0.tar.gz', 'local' : 'requests-2.6.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'ELASTICSEARCH' : { 'setup': 'elasticsearch', 'url': 'https://github.com/elasticsearch/elasticsearch-py/archive/1.4.0.tar.gz', 'local' : 'elasticsearch-1.4.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'PYPARSING' : { 'setup': 'pyparsing', 'url': 'https://pypi.python.org/packages/source/p/pyparsing/pyparsing-2.0.3.tar.gz', 'local' : 'pyparsing-2.0.3.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'PIL' : { 'setup': 'pil', 'url': 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', 'local' : 'Imaging-1.1.7.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'EASYTHUMBNAIL' : { 'setup': 'easy-thumbnail', 'url': 'https://github.com/SmileyChris/easy-thumbnails/archive/2.2.tar.gz', 'local' : 'easy-thumbnails-2.2.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'SIX' : { 'setup': 'six', 'url': 'https://pypi.python.org/packages/source/s/six/six-1.9.0.tar.gz', 'local' : 'six-1.9.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'SIMPLEJSON' : { 'setup': 'simplejson', 'url': 'https://github.com/simplejson/simplejson/archive/v3.6.5.tar.gz', 'local' : 'simplejson-3.6.5.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'HTML5LIB' : { 'setup': 'html5lib', 'url': 'https://github.com/html5lib/html5lib-python/archive/0.999.tar.gz', 'local' : 'html5lib-0.999.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'URLLIB3': { 'setup': 'urllib3', 'url':'https://github.com/shazow/urllib3/archive/1.9.1.tar.gz', 'local':"urllib3-1.9.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'URLLIB3': { 'setup': 'urllib3', 'url':'https://github.com/shazow/urllib3/archive/1.10.2.tar.gz', 'local':"urllib3-1.10.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'PKGCONFIG': { 'setup': 'pkg-config', 'url':'pkg-config-0.28.tar.gz', 'local':"pkg-config-0.28.tar.gz", 'install': {'method': 'install_pkgconfig', 'option_str': None, 'dict_extra_env': None}}, 'SQLITE': { 'setup': 'SQLITE', 'url':'sqlite-autoconf-3080701.tar.gz', 'local':"sqlite-autoconf-3080701.tar.gz", 'install': {'method': 'install_sqlite', 'option_str': None, 'dict_extra_env': None}}, 'UNIXODBC': { 'setup': 'unixODBC', 'url':'unixODBC-2.3.2.tar.gz', 'local':"unixODBC-2.3.2.tar.gz", 'install': {'method': 'install_unixODBC', 'option_str': None, 'dict_extra_env': None}}, @@ -62,6 +61,8 @@ 'CSSSELECT': { 'setup': 'cssselect', 'url':'https://github.com/SimonSapin/cssselect/archive/v0.9.1.tar.gz', 'local':'cssselect-0.9.1.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'CSSUTILS': { 'setup': 'cssutils', 'url':'https://bitbucket.org/cthedot/cssutils/get/v1.0.tar.gz', 'local':'cssutils-1.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'PREMAILER': { 'setup': 'premailer', 'url':'https://pypi.python.org/packages/source/p/premailer/premailer-2.8.3.tar.gz', 'local':'premailer-2.8.3.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'SQLALCHEMY': { 'setup': 'SQLAlchemy', 'url':'https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.9.9.tar.gz', 'local':'SQLAlchemy-0.9.9.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'JEDI': { 'setup': 'jedi', 'url':'https://github.com/davidhalter/jedi/archive/v0.8.1.tar.gz', 'local':'jedi-0.8.1-final0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, } @@ -82,9 +83,9 @@ lxml_options = None URLS.update({ - 'PSYCOPG2': {'setup': 'psycopg2','url': 'http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-2.5.4.tar.gz', 'local':"psycopg2-2.5.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'PIL': {'setup': 'pil', 'url': 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', 'local':"Imaging-1.1.7.tar.gz", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}}, - 'LXML': {'setup': 'lxml', 'url':"lxml-3.4.0.tar.gz", 'local':"lxml-3.4.0.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': lxml_options}}, + 'PSYCOPG2': {'setup': 'psycopg2','url': 'http://initd.org/psycopg/tarballs/PSYCOPG-2-6/psycopg2-2.6.tar.gz', 'local':"psycopg2-2.6.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'PILLOW': {'setup': 'pillow', 'url': 'https://github.com/python-pillow/Pillow/archive/2.7.0.tar.gz', 'local':"Pillow-2.7.0.tar.gz", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}}, + 'LXML': {'setup': 'lxml', 'url':"lxml-3.4.2.tar.gz", 'local':"lxml-3.4.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': lxml_options}}, 'PYYAML' : { 'setup': 'PyYAML', 'url': 'http://pyyaml.org/download/pyyaml/PyYAML-3.11.tar.gz', 'local': 'PyYAML-3.11.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, }) diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/Django-1.6.10.tar.gz Binary file virtualenv/res/src/Django-1.6.10.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/Django-1.7.6.tar.gz Binary file virtualenv/res/src/Django-1.7.6.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/Pillow-2.6.1.tar.gz Binary file virtualenv/res/src/Pillow-2.6.1.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/Pillow-2.7.0.tar.gz Binary file virtualenv/res/src/Pillow-2.7.0.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/SQLAlchemy-0.9.8.tar.gz Binary file virtualenv/res/src/SQLAlchemy-0.9.8.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/SQLAlchemy-0.9.9.tar.gz Binary file virtualenv/res/src/SQLAlchemy-0.9.9.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/South-1.0.1.tar.gz Binary file virtualenv/res/src/South-1.0.1.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/Whoosh-2.6.0.zip Binary file virtualenv/res/src/Whoosh-2.6.0.zip has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/django-extensions-1.4.4.tar.gz Binary file virtualenv/res/src/django-extensions-1.4.4.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/django-extensions-1.5.1.tar.gz Binary file virtualenv/res/src/django-extensions-1.5.1.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/django-haystack-2.2.0.tar.gz Binary file virtualenv/res/src/django-haystack-2.2.0.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/django-haystack-2.3.1.tar.gz Binary file virtualenv/res/src/django-haystack-2.3.1.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/elasticsearch-1.2.0.tar.gz Binary file virtualenv/res/src/elasticsearch-1.2.0.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/elasticsearch-1.4.0.tar.gz Binary file virtualenv/res/src/elasticsearch-1.4.0.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/jedi-0.8.1-final0.tar.gz Binary file virtualenv/res/src/jedi-0.8.1-final0.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/lxml-3.4.0.tar.gz Binary file virtualenv/res/src/lxml-3.4.0.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/lxml-3.4.2.tar.gz Binary file virtualenv/res/src/lxml-3.4.2.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/psycopg2-2.5.4.tar.gz Binary file virtualenv/res/src/psycopg2-2.5.4.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/psycopg2-2.6.tar.gz Binary file virtualenv/res/src/psycopg2-2.6.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/requests-2.4.3.tar.gz Binary file virtualenv/res/src/requests-2.4.3.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/requests-2.6.0.tar.gz Binary file virtualenv/res/src/requests-2.6.0.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/urllib3-1.10.2.tar.gz Binary file virtualenv/res/src/urllib3-1.10.2.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/urllib3-1.9.1.tar.gz Binary file virtualenv/res/src/urllib3-1.9.1.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/res/src/whoosh-2.5.7.tar.gz Binary file virtualenv/res/src/whoosh-2.5.7.tar.gz has changed diff -r 03d4200ae809 -r 92b01b214192 virtualenv/web/res/requirements.txt --- a/virtualenv/web/res/requirements.txt Tue Mar 24 12:16:06 2015 +0100 +++ b/virtualenv/web/res/requirements.txt Tue Mar 24 12:24:28 2015 +0100 @@ -1,14 +1,13 @@ #-e git+git://github.com/IRI-Research/rdflib.git@96c30f98bbb628e13aaa32c9c392584b0fbf8788#egg=rdflib #STATIC_DEPS=true LIBXML2_VERSION=2.9.2 LIBXSLT_VERSION=1.1.28 LIBICONV_VERSION=1.14 pip install --no-index -r requirements.txt -f ../../res/src -Django==1.6.10 -Pillow==2.6.1 +Django==1.7.6 +Pillow==2.7.0 PyYAML==3.11 SPARQLWrapper==1.6.4 -SQLAlchemy==0.9.8 -South==1.0.1 +SQLAlchemy==0.9.9 Unidecode==0.04.17 -Whoosh==2.5.7 +Whoosh==2.6.0 amqp==1.4.6 anyjson==0.3.3 billiard==3.3.0.19 @@ -18,27 +17,28 @@ django-appconf==1.0.1 django-celery-email==1.1.0 django-envelope==1.0 -django-extensions==1.4.4 -django-haystack==2.2.0 +django-extensions==1.5.1 +django-haystack==2.3.1 django-honeypot==0.4.0 django-registration==1.1 easy-thumbnails==2.2 -elasticsearch==1.2.0 +elasticsearch==1.4.0 html5lib==0.999 httplib2==0.9 isodate==0.5.1 +jedi==0.8.1-final0 kombu==3.0.24 -lxml==3.4.0 +lxml==3.4.2 premailer==2.8.3 -psycopg2==2.5.4 +psycopg2==2.6 pycrypto==2.6.1 pyparsing==2.0.3 pytz==2014.10 rdflib==4.2.0-dev -requests==2.4.3 +requests==2.6.0 simplejson==3.6.5 six==1.9.0 -urllib3==1.9.1 +urllib3==1.10.2 wikitools==1.2 wsgiref==0.1.2