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 #2599.
 - Legacy-Id: 15604
Note: SVN reference [15601] has been migrated to Git commit 22d459362aec2a06854a515fbcebfec54e8a6e69
This commit is contained in:
Henrik Levkowetz 2018-10-21 12:36:01 +00:00
parent 3508f59f52
commit 90e773aafa
3 changed files with 50 additions and 13 deletions

View file

@ -292,7 +292,7 @@ def search_for_name(request, name):
search_args += "&rfcs=on&activedrafts=on&olddrafts=on"
else:
for t in doctypenames:
if n.startswith(t.prefix):
if t.prefix and n.startswith(t.prefix):
search_args += "&doctypes=%s" % t.slug
break
else:

View file

@ -1643,7 +1643,7 @@
{
"fields": {
"desc": "Request completed. There were no IANA actions for this document",
"name": "No IC",
"name": "No IANA Actions",
"next_states": [],
"order": 9,
"slug": "noic",
@ -2351,7 +2351,7 @@
{
"fields": {
"about_page": "ietf.group.views.group_about",
"admin_roles": "chair",
"admin_roles": "ad",
"agenda_type": "ietf",
"customize_workflow": false,
"default_tab": "ietf.group.views.group_about",
@ -2374,7 +2374,7 @@
"admin_roles": "chair,secr",
"agenda_type": null,
"customize_workflow": false,
"default_tab": "ietf.group.views.review_requests",
"default_tab": "ietf.group.views.group_about",
"has_chartering_process": false,
"has_default_jabber": false,
"has_dependencies": false,
@ -2411,7 +2411,7 @@
{
"fields": {
"about_page": "ietf.group.views.group_about",
"admin_roles": "chair",
"admin_roles": "chair,lead",
"agenda_type": "ietf",
"customize_workflow": false,
"default_tab": "ietf.group.views.group_about",
@ -8119,7 +8119,7 @@
"desc": "",
"name": "Liaison",
"order": 0,
"prefix": "",
"prefix": "liaison",
"used": false
},
"model": "name.doctypename",
@ -8152,7 +8152,7 @@
"desc": "",
"name": "Review",
"order": 0,
"prefix": "",
"prefix": "review",
"used": true
},
"model": "name.doctypename",
@ -8163,7 +8163,7 @@
"desc": "",
"name": "Shepherd's writeup",
"order": 0,
"prefix": "",
"prefix": "shepherd",
"used": false
},
"model": "name.doctypename",
@ -8416,6 +8416,16 @@
"model": "name.feedbacktypename",
"pk": "questio"
},
{
"fields": {
"desc": "",
"name": "Read",
"order": 0,
"used": true
},
"model": "name.feedbacktypename",
"pk": "read"
},
{
"fields": {
"desc": "Augmented Backus-Naur Form",
@ -10465,7 +10475,7 @@
"fields": {
"command": "xym",
"switch": "--version",
"time": "2018-07-11T00:07:49.096",
"time": "2018-10-19T00:08:03.034",
"used": true,
"version": "xym 0.4"
},
@ -10476,7 +10486,7 @@
"fields": {
"command": "pyang",
"switch": "--version",
"time": "2018-07-11T00:07:49.823",
"time": "2018-10-19T00:08:03.673",
"used": true,
"version": "pyang 1.7.5"
},
@ -10487,7 +10497,7 @@
"fields": {
"command": "yanglint",
"switch": "--version",
"time": "2018-07-11T00:07:50.005",
"time": "2018-10-19T00:08:03.887",
"used": true,
"version": "yanglint 0.14.80"
},
@ -10498,9 +10508,9 @@
"fields": {
"command": "xml2rfc",
"switch": "--version",
"time": "2018-07-11T00:07:51.102",
"time": "2018-10-19T00:08:04.519",
"used": true,
"version": "xml2rfc 2.9.8"
"version": "xml2rfc 2.11.1"
},
"model": "utils.versioninfo",
"pk": 4

View file

@ -0,0 +1,27 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.16 on 2018-10-19 11:34
from __future__ import unicode_literals
from django.db import migrations
def forward(apps, schema_editor):
DocTypeName = apps.get_model('name','DocTypeName')
DocTypeName.objects.filter(slug='liaison').update(prefix='liaison')
DocTypeName.objects.filter(slug='review').update(prefix='review')
DocTypeName.objects.filter(slug='shepwrit').update(prefix='shepherd')
def reverse(apps, schema_editor):
DocTypeName = apps.get_model('name','DocTypeName')
DocTypeName.objects.filter(slug='liaison').update(prefix='')
DocTypeName.objects.filter(slug='review').update(prefix='')
DocTypeName.objects.filter(slug='shepwrit').update(prefix='')
class Migration(migrations.Migration):
dependencies = [
('name', '0003_agendatypename_data'),
]
operations = [
migrations.RunPython(forward, reverse)
]