Skip to content

Commit 1ca085f

Browse files
OleLaursenOleLaursen
committed
Fixed some bugs
 - Legacy-Id: 3162
1 parent 9252336 commit 1ca085f

8 files changed

Lines changed: 42 additions & 41 deletions

File tree

‎ietf/idrfc/testurlREDESIGN.list‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,17 @@
7070

7171
200 /doc/search/
7272
200 /doc/search/?rfcs=on&name=snmp
73-
200 /doc/search/?rfcs=on&name=nfs&by=ad&ad=lars.eggert%40nokia.com
73+
200 /doc/search/?rfcs=on&name=nfs&by=ad&ad=104942
7474
200 /doc/search/?activeDrafts=on&name=sipping
7575
200 /doc/search/?oldDrafts=on&name=tls
76-
200 /doc/search/?activeDrafts=on&oldDrafts=on&ad=lars.eggert%40nokia.com&by=ad
76+
200 /doc/search/?activeDrafts=on&oldDrafts=on&ad=104942&by=ad
7777
200 /doc/search/?activeDrafts=on&state=iesg-eva&by=state
7878
200 /doc/search/?activeDrafts=on&oldDrafts=on&subState=need-rev&by=state
79-
200 /doc/search/?activeDrafts=on&oldDrafts=on&rfcs=on&ad=lars.eggert%40nokia.com&name=nfs&by=ad
79+
200 /doc/search/?activeDrafts=on&oldDrafts=on&rfcs=on&ad=104942&name=nfs&by=ad
8080
200 /doc/search/?rfcs=on&group=tls&by=group
8181
200 /doc/search/?activeDrafts=on&group=tls&by=group
8282
200 /doc/search/?activeDrafts=on&oldDrafts=on&rfcs=on&author=eronen&by=author
83-
200 /doc/search/?activeDrafts=on&oldDrafts=on&rfcs=on&area=178&name=ldap&by=area
83+
200 /doc/search/?activeDrafts=on&oldDrafts=on&rfcs=on&area=934&name=ldap&by=area
8484
200 /doc/search/?activeDrafts=on&name=asdfsadfsdfasdf
8585
200 /doc/search/?activeDrafts=on&name=%EF%BD%8C #non-ASCII
8686

‎ietf/idrfc/views_search.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,8 @@ def add(allow, states):
360360
docs = docs.filter(group__acronym=query["group"])
361361
elif by == "area":
362362
docs = docs.filter(Q(group__parent=query["area"]) |
363-
Q(ad__role__name="ad",
364-
ad__role__group=query["area"]))
363+
Q(ad__email__role__name="ad",
364+
ad__email__role__group=query["area"]))
365365
elif by == "ad":
366366
docs = docs.filter(ad=query["ad"])
367367
elif by == "state":

‎ietf/idtracker/tests.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ def doCanonicalize(self, url, content):
2525
else:
2626
return content
2727

28-
class WGRoleTest(django.test.TestCase):
29-
fixtures = ['wgtest']
30-
31-
def setUp(self):
32-
from ietf.idtracker.models import IETFWG
33-
self.xmas = IETFWG.objects.get(group_acronym__acronym='xmas')
34-
self.snow = IETFWG.objects.get(group_acronym__acronym='snow')
35-
36-
def test_roles(self):
37-
print " Testing WG roles"
38-
self.assertEquals(self.xmas.wgchair_set.all()[0].role(), 'xmas WG Chair')
39-
self.assertEquals(self.snow.wgchair_set.all()[0].role(), 'snow BOF Chair')
40-
self.assertEquals(self.xmas.wgsecretary_set.all()[0].role(), 'xmas WG Secretary')
41-
self.assertEquals(self.xmas.wgtechadvisor_set.all()[0].role(), 'xmas Technical Advisor')
42-
print "OK"
28+
# class WGRoleTest(django.test.TestCase):
29+
# fixtures = ['wgtest']
30+
#
31+
# def setUp(self):
32+
# from ietf.idtracker.models import IETFWG
33+
# self.xmas = IETFWG.objects.get(group_acronym__acronym='xmas')
34+
# self.snow = IETFWG.objects.get(group_acronym__acronym='snow')
35+
#
36+
# def test_roles(self):
37+
# print " Testing WG roles"
38+
# self.assertEquals(self.xmas.wgchair_set.all()[0].role(), 'xmas WG Chair')
39+
# self.assertEquals(self.snow.wgchair_set.all()[0].role(), 'snow BOF Chair')
40+
# self.assertEquals(self.xmas.wgsecretary_set.all()[0].role(), 'xmas WG Secretary')
41+
# self.assertEquals(self.xmas.wgtechadvisor_set.all()[0].role(), 'xmas Technical Advisor')
42+
# print "OK"

‎ietf/idtracker/testurl.list‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66
200 /idtracker/status/last-call/
77

88
301 /idtracker/rfc3847/
9-
301 /idtracker/12689/
109
301 /idtracker/draft-ietf-isis-link-attr/
11-
301 /idtracker/draft-ietf-isis-link-attr/comment/65232/
1210
301 /idtracker/draft-eronen-tls-psk/ # no IESG information
13-
301 /idtracker/comment/65232/
14-
301 /idtracker/ballot/1760/
15-
404 /idtracker/ballot/1723/ # dangling ballot, does not link to any doc
1611
301 /idtracker/
1712
200 /feed/comments/draft-ietf-isis-link-attr/
1813
200 /feed/comments/rfc3373/
@@ -27,5 +22,4 @@
2722
# Test case for missing comment time (bug fixed in changeset 1733)
2823
200 /feed/comments/draft-ietf-msec-newtype-keyid/
2924

30-
200,heavy /sitemap-drafts.xml
3125
200,heavy /sitemap-idtracker.xml

‎ietf/iesg/testurl.list‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,5 @@
2020
200 /iesg/ann/new/
2121
# This takes ~ 300s:
2222
#200 /iesg/ann/prev/
23-
200 /iesg/ann/2422/
24-
200 /iesg/ann/1563/
25-
404 /iesg/ann/567/
2623

2724
200 /feed/iesg-agenda/

‎ietf/ipr/new.py‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,19 @@ def __init__(self, *args, **kw):
102102
setattr(self, contact, ContactForm(prefix=contact[:4], initial=contact_initial.get(contact, {}), *args, **kwnoinit))
103103
rfclist_initial = ""
104104
if update:
105-
rfclist_initial = " ".join(["RFC%d" % rfc.document_id for rfc in update.rfcs.all()])
105+
if settings.USE_DB_REDESIGN_PROXY_CLASSES:
106+
from ietf.ipr.models import IprDocAlias
107+
rfclist_initial = " ".join(a.doc_alias.name.upper() for a in IprDocAlias.objects.filter(doc_alias__name__startswith="rfc", ipr=update))
108+
else:
109+
rfclist_initial = " ".join(["RFC%d" % rfc.document_id for rfc in update.rfcs.all()])
106110
self.base_fields["rfclist"] = forms.CharField(required=False, initial=rfclist_initial)
107111
draftlist_initial = ""
108112
if update:
109-
draftlist_initial = " ".join([draft.document.filename + (draft.revision and "-%s" % draft.revision or "") for draft in update.drafts.all()])
113+
if settings.USE_DB_REDESIGN_PROXY_CLASSES:
114+
from ietf.ipr.models import IprDocAlias
115+
draftlist_initial = " ".join(a.doc_alias.name + ("-%s" % a.rev if a.rev else "") for a in IprDocAlias.objects.filter(ipr=update).exclude(doc_alias__name__startswith="rfc"))
116+
else:
117+
draftlist_initial = " ".join([draft.document.filename + (draft.revision and "-%s" % draft.revision or "") for draft in update.drafts.all()])
110118
self.base_fields["draftlist"] = forms.CharField(required=False, initial=draftlist_initial)
111119
if section_list.get("holder_contact", False):
112120
self.base_fields["hold_contact_is_submitter"] = forms.BooleanField(required=False)
@@ -135,7 +143,7 @@ def clean_rfclist(self):
135143
for rfc in rfclist:
136144
try:
137145
if settings.USE_DB_REDESIGN_PROXY_CLASSES:
138-
from doc.models import DocAlias
146+
from redesign.doc.models import DocAlias
139147
DocAlias.objects.get(name="rfc%s" % int(rfc))
140148
else:
141149
Rfc.objects.get(rfc_number=int(rfc))
@@ -160,7 +168,7 @@ def clean_draftlist(self):
160168
rev = None
161169
try:
162170
if settings.USE_DB_REDESIGN_PROXY_CLASSES:
163-
from doc.models import DocAlias
171+
from redesign.doc.models import DocAlias
164172
id = DocAlias.objects.get(name=filename)
165173
# proxy attribute for code below
166174
id.revision = id.document.rev
@@ -277,7 +285,7 @@ def is_valid(self):
277285
name = draft[:-3]
278286
rev = draft[-2:]
279287

280-
from doc.models import DocAlias
288+
from redesign.doc.models import DocAlias
281289
models.IprDocAlias.objects.create(
282290
doc_alias=DocAlias.objects.get(name=name),
283291
ipr=instance,
@@ -290,7 +298,7 @@ def is_valid(self):
290298
# Save IprRfc(s)
291299
for rfcnum in form.cleaned_data["rfclist"].split():
292300
if settings.USE_DB_REDESIGN_PROXY_CLASSES:
293-
from doc.models import DocAlias
301+
from redesign.doc.models import DocAlias
294302
models.IprDocAlias.objects.create(
295303
doc_alias=DocAlias.objects.get(name="rfc%s" % int(rfcnum)),
296304
ipr=instance,

‎redesign/doc/models.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,13 @@ def latest_event(self, *args, **filter_args):
9696
return e[0] if e else None
9797

9898
def canonical_name(self):
99+
name = self.name
99100
if self.type_id == "draft" and self.state_id == "rfc":
100-
return self.docalias_set.get(name__startswith="rfc").name
101-
else:
102-
return self.name
101+
a = self.docalias_set.filter(name__startswith="rfc")
102+
if a:
103+
name = a[0].name
104+
return name
105+
103106

104107
class RelatedDocHistory(models.Model):
105108
source = models.ForeignKey('DocHistory')
@@ -244,7 +247,7 @@ def __unicode__(self):
244247
return u"%s %s at %s" % (self.by.name, self.get_type_display().lower(), self.time)
245248

246249
class Meta:
247-
ordering = ['-time', 'id']
250+
ordering = ['-time', '-id']
248251

249252
class NewRevisionEvent(Event):
250253
rev = models.CharField(max_length=16)

‎redesign/doc/proxy.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ def b_approve_date(self):
131131
#rfc_number = models.IntegerField(null=True, blank=True, db_index=True)
132132
@property
133133
def rfc_number(self):
134-
# simple optimization for search results
135134
n = self.canonical_name()
136135
return int(n[3:]) if n.startswith("rfc") else None
137136

0 commit comments

Comments
 (0)