Merged in ^/personal/henrik/6.72.1-django-1.11@14676: Upgrade to Djan…

…go 1.11

 - Legacy-Id: 14695

ietf/api/management/commands/makeresources.py

@@ -96,10 +96,10 @@ def handle_app_config(self, app, **options):
                         for field in model._meta.fields:
                             if isinstance(field, (models.ForeignKey, models.OneToOneField)):
                                 #debug.show('field.name')
-                                #debug.pprint('dir(field.rel.to)')
+                                #debug.pprint('dir(field.remote_field.to)')
                                 #exit()
-                                rel_app=field.rel.to._meta.app_label
-                                rel_model_name=field.rel.to.__name__
+                                rel_app=field.remote_field.to._meta.app_label
+                                rel_model_name=field.remote_field.to.__name__
                                 if rel_model_name == model_name:
                                     # foreign key to self class -- quote
                                     # the rmodel_name
@@ -111,10 +111,10 @@ def handle_app_config(self, app, **options):
                                     name=field.name,
                                     app=rel_app,
                                     module=rel_app.split('.')[-1],
-                                    model=field.rel.to,
+                                    model=field.remote_field.to,
                                     model_name=rel_model_name,
                                     rmodel_name=rmodel_name,
-                                    resource_name=field.rel.to.__name__.lower(),
+                                    resource_name=field.remote_field.to.__name__.lower(),
                                     ))
                                 imports[rel_app]["module"] = rel_app
                                 imports[rel_app]["names"].append(rel_model_name)
@@ -124,10 +124,10 @@ def handle_app_config(self, app, **options):
                         m2m_keys = []
                         for field in model._meta.many_to_many:
                                 #debug.show('field.name')
-                                #debug.pprint('dir(field.rel.to)')
+                                #debug.pprint('dir(field.remote_field.to)')
                                 #exit()
-                                rel_app=field.rel.to._meta.app_label
-                                rel_model_name=field.rel.to.__name__
+                                rel_app=field.remote_field.to._meta.app_label
+                                rel_model_name=field.remote_field.to.__name__
                                 if rel_model_name == model_name:
                                     # foreign key to self class -- quote
                                     # the rmodel_name
@@ -139,10 +139,10 @@ def handle_app_config(self, app, **options):
                                     name=field.name,
                                     app=rel_app,
                                     module=rel_app.split('.')[-1],
-                                    model=field.rel.to,
+                                    model=field.remote_field.to,
                                     model_name=rel_model_name,
                                     rmodel_name=rmodel_name,
-                                    resource_name=field.rel.to.__name__.lower(),
+                                    resource_name=field.remote_field.to.__name__.lower(),
                                     ))
                                 imports[rel_app]["module"] = rel_app
                                 imports[rel_app]["names"].append(rel_model_name)

ietf/community/migrations/0001_initial.py

@@ -1,90 +1,40 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-02-20 10:52
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+import django.db.models.deletion
+import ietf.utils.models
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
     ]
 
     operations = [
         migrations.CreateModel(
             name='CommunityList',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('secret', models.CharField(max_length=255, null=True, blank=True)),
-                ('cached', models.TextField(null=True, blank=True)),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='DisplayConfiguration',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('sort_method', models.CharField(default=b'by_filename', max_length=100, choices=[(b'by_filename', b'Alphabetical by I-D filename and RFC number'), (b'by_title', b'Alphabetical by document title'), (b'by_wg', b'Alphabetical by associated WG'), (b'date_publication', b'Date of publication of current version of the document'), (b'recent_change', b'Date of most recent change of status of any type'), (b'recent_significant', b'Date of most recent significant change of status')])),
-                ('display_fields', models.TextField(default=b'filename,title,date')),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='DocumentChangeDates',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('new_version_date', models.DateTimeField(null=True, blank=True)),
-                ('normal_change_date', models.DateTimeField(null=True, blank=True)),
-                ('significant_change_date', models.DateTimeField(null=True, blank=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
             ],
-            options={
-            },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='EmailSubscription',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('email', models.CharField(max_length=200)),
-                ('significant', models.BooleanField(default=False)),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='ExpectedChange',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('expected_date', models.DateField(verbose_name=b'Expected date')),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='ListNotification',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('significant', models.BooleanField(default=False)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('notify_on', models.CharField(choices=[(b'all', b'All changes'), (b'significant', b'Only significant state changes')], default=b'all', max_length=30)),
             ],
-            options={
-            },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
-            name='Rule',
+            name='SearchRule',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('rule_type', models.CharField(max_length=30, choices=[(b'wg_asociated', b'All I-Ds associated with a particular WG'), (b'area_asociated', b'All I-Ds associated with all WGs in a particular Area'), (b'ad_responsible', b'All I-Ds with a particular responsible AD'), (b'author', b'All I-Ds with a particular author'), (b'shepherd', b'All I-Ds with a particular document shepherd'), (b'with_text', b'All I-Ds that contain a particular text string in the name'), (b'in_iab_state', b'All I-Ds that are in a particular IAB state'), (b'in_iana_state', b'All I-Ds that are in a particular IANA state'), (b'in_iesg_state', b'All I-Ds that are in a particular IESG state'), (b'in_irtf_state', b'All I-Ds that are in a particular IRTF state'), (b'in_ise_state', b'All I-Ds that are in a particular ISE state'), (b'in_rfcEdit_state', b'All I-Ds that are in a particular RFC Editor state'), (b'in_wg_state', b'All I-Ds that are in a particular Working Group state'), (b'wg_asociated_rfc', b'All RFCs associated with a particular WG'), (b'area_asociated_rfc', b'All RFCs associated with all WGs in a particular Area'), (b'author_rfc', b'All RFCs with a particular author')])),
-                ('value', models.CharField(max_length=255)),
-                ('last_updated', models.DateTimeField(auto_now=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('rule_type', models.CharField(choices=[(b'group', b'All I-Ds associated with a particular group'), (b'area', b'All I-Ds associated with all groups in a particular Area'), (b'group_rfc', b'All RFCs associated with a particular group'), (b'area_rfc', b'All RFCs associated with all groups in a particular Area'), (b'state_iab', b'All I-Ds that are in a particular IAB state'), (b'state_iana', b'All I-Ds that are in a particular IANA state'), (b'state_iesg', b'All I-Ds that are in a particular IESG state'), (b'state_irtf', b'All I-Ds that are in a particular IRTF state'), (b'state_ise', b'All I-Ds that are in a particular ISE state'), (b'state_rfceditor', b'All I-Ds that are in a particular RFC Editor state'), (b'state_ietf', b'All I-Ds that are in a particular Working Group state'), (b'author', b'All I-Ds with a particular author'), (b'author_rfc', b'All RFCs with a particular author'), (b'ad', b'All I-Ds with a particular responsible AD'), (b'shepherd', b'All I-Ds with a particular document shepherd'), (b'name_contains', b'All I-Ds with particular text/regular expression in the name')], max_length=30)),
+                ('text', models.CharField(blank=True, default=b'', max_length=255, verbose_name=b'Text/RegExp')),
+                ('community_list', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='community.CommunityList')),
             ],
-            options={
-            },
-            bases=(models.Model,),
         ),
     ]