Skip to content

Commit 90e773a

Browse files
committed
Merged in [15601] from rjsparks@nostrum.com:
Corrected some DocTypeName entries' prefix value. Made the search code more robust against DocTypeName objects that have an empty prefix value. Fixes ietf-tools#2599. - Legacy-Id: 15604 Note: SVN reference [15601] has been migrated to Git commit 22d4593
1 parent 3508f59 commit 90e773a

3 files changed

Lines changed: 50 additions & 13 deletions

File tree

ietf/doc/views_search.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ def cached_redirect(cache_key, url):
292292
search_args += "&rfcs=on&activedrafts=on&olddrafts=on"
293293
else:
294294
for t in doctypenames:
295-
if n.startswith(t.prefix):
295+
if t.prefix and n.startswith(t.prefix):
296296
search_args += "&doctypes=%s" % t.slug
297297
break
298298
else:

ietf/name/fixtures/names.json

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@
16431643
{
16441644
"fields": {
16451645
"desc": "Request completed. There were no IANA actions for this document",
1646-
"name": "No IC",
1646+
"name": "No IANA Actions",
16471647
"next_states": [],
16481648
"order": 9,
16491649
"slug": "noic",
@@ -2351,7 +2351,7 @@
23512351
{
23522352
"fields": {
23532353
"about_page": "ietf.group.views.group_about",
2354-
"admin_roles": "chair",
2354+
"admin_roles": "ad",
23552355
"agenda_type": "ietf",
23562356
"customize_workflow": false,
23572357
"default_tab": "ietf.group.views.group_about",
@@ -2374,7 +2374,7 @@
23742374
"admin_roles": "chair,secr",
23752375
"agenda_type": null,
23762376
"customize_workflow": false,
2377-
"default_tab": "ietf.group.views.review_requests",
2377+
"default_tab": "ietf.group.views.group_about",
23782378
"has_chartering_process": false,
23792379
"has_default_jabber": false,
23802380
"has_dependencies": false,
@@ -2411,7 +2411,7 @@
24112411
{
24122412
"fields": {
24132413
"about_page": "ietf.group.views.group_about",
2414-
"admin_roles": "chair",
2414+
"admin_roles": "chair,lead",
24152415
"agenda_type": "ietf",
24162416
"customize_workflow": false,
24172417
"default_tab": "ietf.group.views.group_about",
@@ -8119,7 +8119,7 @@
81198119
"desc": "",
81208120
"name": "Liaison",
81218121
"order": 0,
8122-
"prefix": "",
8122+
"prefix": "liaison",
81238123
"used": false
81248124
},
81258125
"model": "name.doctypename",
@@ -8152,7 +8152,7 @@
81528152
"desc": "",
81538153
"name": "Review",
81548154
"order": 0,
8155-
"prefix": "",
8155+
"prefix": "review",
81568156
"used": true
81578157
},
81588158
"model": "name.doctypename",
@@ -8163,7 +8163,7 @@
81638163
"desc": "",
81648164
"name": "Shepherd's writeup",
81658165
"order": 0,
8166-
"prefix": "",
8166+
"prefix": "shepherd",
81678167
"used": false
81688168
},
81698169
"model": "name.doctypename",
@@ -8416,6 +8416,16 @@
84168416
"model": "name.feedbacktypename",
84178417
"pk": "questio"
84188418
},
8419+
{
8420+
"fields": {
8421+
"desc": "",
8422+
"name": "Read",
8423+
"order": 0,
8424+
"used": true
8425+
},
8426+
"model": "name.feedbacktypename",
8427+
"pk": "read"
8428+
},
84198429
{
84208430
"fields": {
84218431
"desc": "Augmented Backus-Naur Form",
@@ -10465,7 +10475,7 @@
1046510475
"fields": {
1046610476
"command": "xym",
1046710477
"switch": "--version",
10468-
"time": "2018-07-11T00:07:49.096",
10478+
"time": "2018-10-19T00:08:03.034",
1046910479
"used": true,
1047010480
"version": "xym 0.4"
1047110481
},
@@ -10476,7 +10486,7 @@
1047610486
"fields": {
1047710487
"command": "pyang",
1047810488
"switch": "--version",
10479-
"time": "2018-07-11T00:07:49.823",
10489+
"time": "2018-10-19T00:08:03.673",
1048010490
"used": true,
1048110491
"version": "pyang 1.7.5"
1048210492
},
@@ -10487,7 +10497,7 @@
1048710497
"fields": {
1048810498
"command": "yanglint",
1048910499
"switch": "--version",
10490-
"time": "2018-07-11T00:07:50.005",
10500+
"time": "2018-10-19T00:08:03.887",
1049110501
"used": true,
1049210502
"version": "yanglint 0.14.80"
1049310503
},
@@ -10498,9 +10508,9 @@
1049810508
"fields": {
1049910509
"command": "xml2rfc",
1050010510
"switch": "--version",
10501-
"time": "2018-07-11T00:07:51.102",
10511+
"time": "2018-10-19T00:08:04.519",
1050210512
"used": true,
10503-
"version": "xml2rfc 2.9.8"
10513+
"version": "xml2rfc 2.11.1"
1050410514
},
1050510515
"model": "utils.versioninfo",
1050610516
"pk": 4
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.16 on 2018-10-19 11:34
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations
6+
7+
def forward(apps, schema_editor):
8+
DocTypeName = apps.get_model('name','DocTypeName')
9+
DocTypeName.objects.filter(slug='liaison').update(prefix='liaison')
10+
DocTypeName.objects.filter(slug='review').update(prefix='review')
11+
DocTypeName.objects.filter(slug='shepwrit').update(prefix='shepherd')
12+
13+
def reverse(apps, schema_editor):
14+
DocTypeName = apps.get_model('name','DocTypeName')
15+
DocTypeName.objects.filter(slug='liaison').update(prefix='')
16+
DocTypeName.objects.filter(slug='review').update(prefix='')
17+
DocTypeName.objects.filter(slug='shepwrit').update(prefix='')
18+
19+
class Migration(migrations.Migration):
20+
21+
dependencies = [
22+
('name', '0003_agendatypename_data'),
23+
]
24+
25+
operations = [
26+
migrations.RunPython(forward, reverse)
27+
]

0 commit comments

Comments
 (0)