From 720943af72d33afa42c2fb85462b1d0271c2f377 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 7 Feb 2019 15:56:48 +0000 Subject: [PATCH] Removed the has_dependencies GroupFeature, and used has_documents instead in the one place it was used. - Legacy-Id: 15934 --- ietf/group/admin.py | 1 - ...0_remove_groupfeatures_has_dependencies.py | 23 +++++++++++++++ ietf/group/models.py | 1 - ietf/name/fixtures/names.json | 28 ++++--------------- ietf/templates/group/group_about.html | 2 +- 5 files changed, 30 insertions(+), 25 deletions(-) create mode 100644 ietf/group/migrations/0010_remove_groupfeatures_has_dependencies.py diff --git a/ietf/group/admin.py b/ietf/group/admin.py index 462140eea..ad3056ce1 100644 --- a/ietf/group/admin.py +++ b/ietf/group/admin.py @@ -110,7 +110,6 @@ class GroupFeaturesAdmin(admin.ModelAdmin): 'has_milestones', 'has_chartering_process', 'has_documents', - 'has_dependencies', 'has_session_materials', 'has_nonsession_materials', 'has_meetings', diff --git a/ietf/group/migrations/0010_remove_groupfeatures_has_dependencies.py b/ietf/group/migrations/0010_remove_groupfeatures_has_dependencies.py new file mode 100644 index 000000000..2688a4baa --- /dev/null +++ b/ietf/group/migrations/0010_remove_groupfeatures_has_dependencies.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.17 on 2019-02-07 07:29 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('group', '0009_auto_20190122_1012'), + ] + + operations = [ + migrations.RemoveField( + model_name='groupfeatures', + name='has_dependencies', + ), + migrations.RemoveField( + model_name='historicalgroupfeatures', + name='has_dependencies', + ), + ] diff --git a/ietf/group/models.py b/ietf/group/models.py index 2b5a6b508..2ec0aca9a 100644 --- a/ietf/group/models.py +++ b/ietf/group/models.py @@ -211,7 +211,6 @@ class GroupFeatures(models.Model): has_milestones = models.BooleanField("Milestones", default=False) has_chartering_process = models.BooleanField("Chartering", default=False) has_documents = models.BooleanField("Documents", default=False) # i.e. drafts/RFCs - has_dependencies = models.BooleanField("Dependencies",default=False) # Do dependency graphs for group documents make sense? has_session_materials = models.BooleanField("Sess Matrl.", default=False) has_nonsession_materials= models.BooleanField("Other Matrl.", default=False) has_meetings = models.BooleanField("Meetings", default=False) diff --git a/ietf/name/fixtures/names.json b/ietf/name/fixtures/names.json index 6fc88da13..5720879bd 100644 --- a/ietf/name/fixtures/names.json +++ b/ietf/name/fixtures/names.json @@ -2358,8 +2358,7 @@ "groupman_roles": "[\"ad\",\"chair\",\"delegate\"]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, - "has_documents": false, + "has_documents": true, "has_meetings": true, "has_milestones": false, "has_nonsession_materials": false, @@ -2389,7 +2388,6 @@ "groupman_roles": "[\"ad\"]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": false, "has_meetings": false, "has_milestones": false, @@ -2420,7 +2418,6 @@ "groupman_roles": "[\"ad\",\"secr\"]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": false, "has_meetings": false, "has_milestones": false, @@ -2451,7 +2448,6 @@ "groupman_roles": "[]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": false, "has_meetings": true, "has_milestones": false, @@ -2482,7 +2478,6 @@ "groupman_roles": "[\"chair\",\"delegate\"]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": false, "has_meetings": true, "has_milestones": false, @@ -2513,7 +2508,6 @@ "groupman_roles": "[]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": false, "has_meetings": false, "has_milestones": false, @@ -2544,7 +2538,6 @@ "groupman_roles": "[\"chair\",\"delegate\"]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": false, "has_meetings": false, "has_milestones": false, @@ -2575,7 +2568,6 @@ "groupman_roles": "[\"chair\"]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": false, "has_meetings": false, "has_milestones": false, @@ -2606,7 +2598,6 @@ "groupman_roles": "[\"chair\",\"advisor\"]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": false, "has_meetings": false, "has_milestones": false, @@ -2637,7 +2628,6 @@ "groupman_roles": "[\"chair\",\"secr\"]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": true, "has_meetings": false, "has_milestones": true, @@ -2668,7 +2658,6 @@ "groupman_roles": "[\"ad\",\"secr\"]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": false, "has_meetings": false, "has_milestones": false, @@ -2699,7 +2688,6 @@ "groupman_roles": "[]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": false, "has_meetings": false, "has_milestones": false, @@ -2730,7 +2718,6 @@ "groupman_roles": "[\"chair\",\"secr\"]", "has_chartering_process": true, "has_default_jabber": true, - "has_dependencies": true, "has_documents": true, "has_meetings": true, "has_milestones": true, @@ -2761,7 +2748,6 @@ "groupman_roles": "[]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": false, "has_meetings": false, "has_milestones": false, @@ -2792,7 +2778,6 @@ "groupman_roles": "[\"chair\"]", "has_chartering_process": false, "has_default_jabber": false, - "has_dependencies": false, "has_documents": false, "has_meetings": true, "has_milestones": false, @@ -2823,7 +2808,6 @@ "groupman_roles": "[\"ad\",\"chair\",\"delegate\",\"secr\"]", "has_chartering_process": true, "has_default_jabber": true, - "has_dependencies": true, "has_documents": true, "has_meetings": true, "has_milestones": true, @@ -10718,7 +10702,7 @@ "fields": { "command": "xym", "switch": "--version", - "time": "2019-01-29T00:08:12.391", + "time": "2019-02-06T00:08:09.183", "used": true, "version": "xym 0.4" }, @@ -10729,7 +10713,7 @@ "fields": { "command": "pyang", "switch": "--version", - "time": "2019-01-29T00:08:13.189", + "time": "2019-02-06T00:08:10.172", "used": true, "version": "pyang 1.7.8" }, @@ -10740,7 +10724,7 @@ "fields": { "command": "yanglint", "switch": "--version", - "time": "2019-01-29T00:08:13.351", + "time": "2019-02-06T00:08:10.404", "used": true, "version": "yanglint 0.14.80" }, @@ -10751,9 +10735,9 @@ "fields": { "command": "xml2rfc", "switch": "--version", - "time": "2019-01-29T00:08:14.372", + "time": "2019-02-06T00:08:11.933", "used": true, - "version": "xml2rfc 2.17.0" + "version": "xml2rfc 2.17.2" }, "model": "utils.versioninfo", "pk": 4 diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html index 8c74912f2..aae865416 100644 --- a/ietf/templates/group/group_about.html +++ b/ietf/templates/group/group_about.html @@ -101,7 +101,7 @@ {% endif %} - {% if group.features.has_dependencies %} + {% if group.features.has_documents %} Dependencies