Add redirects for all of /idtracker/*, remove all view code and other
dead code from idtracker/ - Legacy-Id: 5640
This commit is contained in:
Ole Laursen
parent
3c32c6e75b
commit
ec920d5a83
ietf
13
ietf/doc/redirect_idtracker_urls.py
Normal file
13
ietf/doc/redirect_idtracker_urls.py
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
from django.conf.urls.defaults import patterns, url
|
||||
from django.views.generic.simple import redirect_to
|
||||
|
||||
urlpatterns = patterns('',
|
||||
(r'^help/(?:sub)?state/(?:\d+/)?$', redirect_to, {'url': '/doc/help/state/draft-iesg/' }),
|
||||
(r'^help/evaluation/$', redirect_to, {'url':'http://www.ietf.org/iesg/voting-procedures.html' }),
|
||||
(r'^status/$', redirect_to, {'url':'/doc/iesg/' }),
|
||||
(r'^status/last-call/$', redirect_to, {'url':'/doc/iesg/last-call/' }),
|
||||
(r'^rfc0*(?P<rfc_number>\d+)/$', redirect_to, {'url':'/doc/rfc%(rfc_number)s/' }),
|
||||
(r'^(?P<name>[^/]+)/$', redirect_to, {'url':'/doc/%(name)s/' }),
|
||||
(r'^(?P<name>[^/]+)/comment/\d+/$', redirect_to, {'url':'/doc/%(name)s/history/' }),
|
||||
(r'^$', redirect_to, { 'url': '/doc/'}),
|
||||
)
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
form_for_model(IDInternal) will autogenerate form elemnts to edit the model
|
||||
|
||||
class ImageAddForm(BaseForm):
|
||||
|
||||
def __init__(self, *args, name=None, **kwargs):
|
||||
super(ImageAddForm, self).__init__(*args, **kwargs)
|
||||
self.fields['category'].choices=(('a','a'),)
|
||||
# create filter based on name=
|
||||
|
||||
ImageForm = form_for_model(Image, form=ImageAddForm)
|
||||
foo = ImageForm(name='foo')
|
||||
|
||||
|
||||
|
||||
To get from draft to author list:
|
||||
|
||||
>>> d = a[5]
|
||||
>>> print d
|
||||
draft-fenner-zinin-rtg-standard-reqts
|
||||
>>> print d.authors.all()
|
||||
[<IDAuthors: IDAuthors object>, <IDAuthors: IDAuthors object>]
|
||||
>>> l=d.authors.all()
|
||||
>>> print l[0].person
|
||||
Bill Fenner
|
||||
>>> print l[0].person.emailaddresses_set.filter(priority=d.id_document_tag)
|
||||
[<EmailAddresses: EmailAddresses object>]
|
||||
>>> print l[0].person.emailaddresses_set.filter(priority=d.id_document_tag)[0].ail_address
|
||||
fenner@research.att.com
|
||||
|
||||
IDAuthors should have an auxilliary function for this.
|
||||
It's the one that has the person linkage and knows the document.
|
||||
|
||||
|
||||
--
|
||||
we should use a variant of django-registration.
|
||||
http://www.stonemind.net/blog/2007/04/13/django-registration-for-newbies/
|
||||
|
||||
1. verify email address with round trip
|
||||
2. if there's a row in iesg_login, use that username
|
||||
(? liaison tool logins ?)
|
||||
otherwise, force the email address
|
||||
3. get a password and create the user
|
||||
(this is almost the same as resetting the password)
|
||||
4. find the person_or_org_info row, associate that with
|
||||
the user row
|
||||
|
||||
--
|
||||
|
||||
<ubernostrum> Both the regular and date-base object_detail can take either an
|
||||
+object_id, or a slug/slug_field combo.
|
||||
<ubernostrum> So use the username as the "slug" and specify 'username' as the
|
||||
+'slug_field' argument.
|
||||
|
||||
http://www.b-list.org/weblog/2006/11/16/django-tips-get-most-out-generic-views
|
||||
|
||||
newly learned: 'slug_field' just gets passed so can be otherdb__username
|
||||
1
ietf/idtracker/fixtures/.gitignore
vendored
1
ietf/idtracker/fixtures/.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
/*.pyc
|
||||
|
|
@ -1,151 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<django-objects version="1.0">
|
||||
<object pk="4" model="idtracker.personororginfo">
|
||||
<field type="CharField" name="record_type"></field>
|
||||
<field type="CharField" name="name_prefix"></field>
|
||||
<field type="CharField" name="first_name">Hermey</field>
|
||||
<field type="CharField" name="first_name_key">HERMEY</field>
|
||||
<field type="CharField" name="middle_initial"></field>
|
||||
<field type="CharField" name="middle_initial_key"></field>
|
||||
<field type="CharField" name="last_name">Elf</field>
|
||||
<field type="CharField" name="last_name_key">ELF</field>
|
||||
<field type="CharField" name="name_suffix"></field>
|
||||
<field type="DateField" name="date_modified">2007-07-02</field>
|
||||
<field type="CharField" name="modified_by"></field>
|
||||
<field type="DateField" name="date_created">2007-07-02</field>
|
||||
<field type="CharField" name="created_by"></field>
|
||||
<field type="CharField" name="address_type"></field>
|
||||
</object>
|
||||
<object pk="1" model="idtracker.personororginfo">
|
||||
<field type="CharField" name="record_type"></field>
|
||||
<field type="CharField" name="name_prefix"></field>
|
||||
<field type="CharField" name="first_name">Kris</field>
|
||||
<field type="CharField" name="first_name_key">KRIS</field>
|
||||
<field type="CharField" name="middle_initial"></field>
|
||||
<field type="CharField" name="middle_initial_key"></field>
|
||||
<field type="CharField" name="last_name">Kringle</field>
|
||||
<field type="CharField" name="last_name_key">KRINGLE</field>
|
||||
<field type="CharField" name="name_suffix"></field>
|
||||
<field type="DateField" name="date_modified">2007-07-02</field>
|
||||
<field type="CharField" name="modified_by"></field>
|
||||
<field type="DateField" name="date_created">2007-07-02</field>
|
||||
<field type="CharField" name="created_by"></field>
|
||||
<field type="CharField" name="address_type"></field>
|
||||
</object>
|
||||
<object pk="2" model="idtracker.personororginfo">
|
||||
<field type="CharField" name="record_type"></field>
|
||||
<field type="CharField" name="name_prefix"></field>
|
||||
<field type="CharField" name="first_name">Snow</field>
|
||||
<field type="CharField" name="first_name_key">SNOW</field>
|
||||
<field type="CharField" name="middle_initial"></field>
|
||||
<field type="CharField" name="middle_initial_key"></field>
|
||||
<field type="CharField" name="last_name">Miser</field>
|
||||
<field type="CharField" name="last_name_key">MISER</field>
|
||||
<field type="CharField" name="name_suffix"></field>
|
||||
<field type="DateField" name="date_modified">2007-07-02</field>
|
||||
<field type="CharField" name="modified_by"></field>
|
||||
<field type="DateField" name="date_created">2007-07-02</field>
|
||||
<field type="CharField" name="created_by"></field>
|
||||
<field type="CharField" name="address_type"></field>
|
||||
</object>
|
||||
<object pk="3" model="idtracker.personororginfo">
|
||||
<field type="CharField" name="record_type"></field>
|
||||
<field type="CharField" name="name_prefix"></field>
|
||||
<field type="CharField" name="first_name">Rudolph</field>
|
||||
<field type="CharField" name="first_name_key">RUDOLPH</field>
|
||||
<field type="CharField" name="middle_initial"></field>
|
||||
<field type="CharField" name="middle_initial_key"></field>
|
||||
<field type="CharField" name="last_name">Reindeer</field>
|
||||
<field type="CharField" name="last_name_key">REINDEER</field>
|
||||
<field type="CharField" name="name_suffix"></field>
|
||||
<field type="DateField" name="date_modified">2007-07-02</field>
|
||||
<field type="CharField" name="modified_by"></field>
|
||||
<field type="DateField" name="date_created">2007-07-02</field>
|
||||
<field type="CharField" name="created_by"></field>
|
||||
<field type="CharField" name="address_type"></field>
|
||||
</object>
|
||||
<object pk="1" model="idtracker.wgchair">
|
||||
<field to="idtracker.personororginfo" name="person" rel="ManyToOneRel">1</field>
|
||||
<field to="idtracker.ietfwg" name="group_acronym" rel="ManyToOneRel">1</field>
|
||||
</object>
|
||||
<object pk="2" model="idtracker.wgchair">
|
||||
<field to="idtracker.personororginfo" name="person" rel="ManyToOneRel">2</field>
|
||||
<field to="idtracker.ietfwg" name="group_acronym" rel="ManyToOneRel">2</field>
|
||||
</object>
|
||||
<object pk="1" model="idtracker.ietfwg">
|
||||
<field to="idtracker.wgtype" name="group_type" rel="ManyToOneRel">1</field>
|
||||
<field type="DateField" name="proposed_date"><None></None></field>
|
||||
<field type="DateField" name="start_date"><None></None></field>
|
||||
<field type="DateField" name="dormant_date"><None></None></field>
|
||||
<field type="DateField" name="concluded_date"><None></None></field>
|
||||
<field to="idtracker.wgstatus" name="status" rel="ManyToOneRel">1</field>
|
||||
<field to="idtracker.areadirector" name="area_director" rel="ManyToOneRel"><None></None></field>
|
||||
<field type="CharField" name="meeting_scheduled"></field>
|
||||
<field type="CharField" name="email_address"></field>
|
||||
<field type="CharField" name="email_subscribe"></field>
|
||||
<field type="CharField" name="email_keyword"></field>
|
||||
<field type="CharField" name="email_archive"></field>
|
||||
<field type="TextField" name="comments"></field>
|
||||
<field type="DateField" name="last_modified_date">2007-07-02</field>
|
||||
<field type="CharField" name="meeting_scheduled_old"></field>
|
||||
</object>
|
||||
<object pk="2" model="idtracker.ietfwg">
|
||||
<field to="idtracker.wgtype" name="group_type" rel="ManyToOneRel">3</field>
|
||||
<field type="DateField" name="proposed_date"><None></None></field>
|
||||
<field type="DateField" name="start_date"><None></None></field>
|
||||
<field type="DateField" name="dormant_date"><None></None></field>
|
||||
<field type="DateField" name="concluded_date"><None></None></field>
|
||||
<field to="idtracker.wgstatus" name="status" rel="ManyToOneRel">1</field>
|
||||
<field to="idtracker.areadirector" name="area_director" rel="ManyToOneRel"><None></None></field>
|
||||
<field type="CharField" name="meeting_scheduled"></field>
|
||||
<field type="CharField" name="email_address"></field>
|
||||
<field type="CharField" name="email_subscribe"></field>
|
||||
<field type="CharField" name="email_keyword"></field>
|
||||
<field type="CharField" name="email_archive"></field>
|
||||
<field type="TextField" name="comments"></field>
|
||||
<field type="DateField" name="last_modified_date">2007-07-02</field>
|
||||
<field type="CharField" name="meeting_scheduled_old"></field>
|
||||
</object>
|
||||
<object pk="1" model="idtracker.acronym">
|
||||
<field type="CharField" name="acronym">xmas</field>
|
||||
<field type="CharField" name="name">Christmas</field>
|
||||
<field type="CharField" name="name_key">CHRISTMAS</field>
|
||||
</object>
|
||||
<object pk="2" model="idtracker.acronym">
|
||||
<field type="CharField" name="acronym">snow</field>
|
||||
<field type="CharField" name="name">Silly New Operational Work</field>
|
||||
<field type="CharField" name="name_key">SILLY NEW OPERATIONAL WORK</field>
|
||||
</object>
|
||||
<object pk="1" model="idtracker.wgtype">
|
||||
<field type="CharField" name="type">WG</field>
|
||||
</object>
|
||||
<object pk="2" model="idtracker.wgtype">
|
||||
<field type="CharField" name="type">PWG</field>
|
||||
</object>
|
||||
<object pk="3" model="idtracker.wgtype">
|
||||
<field type="CharField" name="type">BOF</field>
|
||||
</object>
|
||||
<object pk="4" model="idtracker.wgtype">
|
||||
<field type="CharField" name="type">AG</field>
|
||||
</object>
|
||||
<object pk="5" model="idtracker.wgtype">
|
||||
<field type="CharField" name="type">TEAM</field>
|
||||
</object>
|
||||
<object pk="1" model="idtracker.wgstatus">
|
||||
<field type="CharField" name="status">Active</field>
|
||||
</object>
|
||||
<object pk="2" model="idtracker.wgstatus">
|
||||
<field type="CharField" name="status">Dormant</field>
|
||||
</object>
|
||||
<object pk="3" model="idtracker.wgstatus">
|
||||
<field type="CharField" name="status">Concluded</field>
|
||||
</object>
|
||||
<object pk="1" model="idtracker.wgtechadvisor">
|
||||
<field to="idtracker.ietfwg" name="group_acronym" rel="ManyToOneRel">1</field>
|
||||
<field to="idtracker.personororginfo" name="person" rel="ManyToOneRel">3</field>
|
||||
</object>
|
||||
<object pk="1" model="idtracker.wgsecretary">
|
||||
<field to="idtracker.ietfwg" name="group_acronym" rel="ManyToOneRel">1</field>
|
||||
<field to="idtracker.personororginfo" name="person" rel="ManyToOneRel">4</field>
|
||||
</object>
|
||||
</django-objects>
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
# Copyright The IETF Trust 2007, All Rights Reserved
|
||||
|
||||
from django import template
|
||||
from ietf import __date__, __rev__, __version__, __id__
|
||||
|
||||
|
||||
register = template.Library()
|
||||
|
||||
|
||||
@register.simple_tag
|
||||
def revision_time():
|
||||
return __date__[7:32]
|
||||
|
||||
@register.simple_tag
|
||||
def revision_date():
|
||||
return __date__[34:-3]
|
||||
|
||||
@register.simple_tag
|
||||
def revision_num():
|
||||
return __rev__[6:-2]
|
||||
|
||||
@register.simple_tag
|
||||
def revision_id():
|
||||
return __id__[5:-2]
|
||||
|
||||
@register.simple_tag
|
||||
def version_num():
|
||||
return __version__
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
200 /idtracker/help/state/
|
||||
200 /idtracker/help/state/12/
|
||||
200 /idtracker/help/substate/1/
|
||||
301 /idtracker/help/evaluation/
|
||||
200 /idtracker/status/
|
||||
200 /idtracker/status/last-call/
|
||||
|
||||
301 /idtracker/rfc3847/
|
||||
301 /idtracker/draft-ietf-isis-link-attr/
|
||||
301 /idtracker/draft-eronen-tls-psk/ # no IESG information
|
||||
301 /idtracker/
|
||||
200 /feed/comments/draft-ietf-isis-link-attr/
|
||||
200 /feed/comments/rfc3373/
|
||||
200 /feed/last-call/
|
||||
|
||||
# An RFC with no matching value in InternetDrafts. This tests
|
||||
# subtle cases of using the draft relation when it's not appropriate.
|
||||
# See ticket #218.
|
||||
301 /idtracker/rfc2444/
|
||||
200 /feed/comments/rfc2444/
|
||||
|
||||
# Test case for missing comment time (bug fixed in changeset 1733)
|
||||
200 /feed/comments/draft-ietf-msec-newtype-keyid/
|
||||
|
||||
#200,heavy /sitemap-idtracker.xml
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
# Copyright The IETF Trust 2007, All Rights Reserved
|
||||
|
||||
from django.conf.urls.defaults import patterns, url
|
||||
from ietf.idtracker.models import IDState, IDSubState
|
||||
from ietf.idtracker import views
|
||||
from django.views.generic.simple import redirect_to
|
||||
|
||||
urlpatterns = patterns('django.views.generic.simple',
|
||||
url(r'^help/state/$', 'direct_to_template', { 'template': 'idtracker/states.html', 'extra_context': { 'states': IDState.objects.all(), 'substates': IDSubState.objects.all() } }, name="help_states"),
|
||||
(r'^help/evaluation/$', redirect_to, {'url':'http://www.ietf.org/iesg/voting-procedures.html' }),
|
||||
)
|
||||
urlpatterns += patterns('',
|
||||
(r'^status/$', views.status),
|
||||
(r'^status/last-call/$', views.last_call),
|
||||
)
|
||||
urlpatterns += patterns('',
|
||||
(r'^rfc0*(?P<rfc_number>\d+)/$', views.redirect_rfc),
|
||||
(r'^(?P<object_id>\d+)/$', views.redirect_id),
|
||||
(r'^(?P<filename>[^/]+)/$', views.redirect_filename),
|
||||
(r'^comment/(?P<object_id>\d+)/$', views.redirect_comment),
|
||||
(r'^ballot/(?P<object_id>\d+)/$', views.redirect_ballot),
|
||||
(r'^([^/]+)/comment/(?P<object_id>\d+)/$', views.redirect_comment),
|
||||
(r'^help/state/(?P<state>\d+)/$', views.state_desc),
|
||||
(r'^help/substate/(?P<state>\d+)/$', views.state_desc, { 'is_substate': 1 }),
|
||||
(r'^$', redirect_to, { 'url': '/doc/'}),
|
||||
)
|
||||
|
|
@ -53,7 +53,7 @@ urlpatterns = patterns('',
|
|||
(r'^doc/', include('ietf.idrfc.urls')),
|
||||
(r'^drafts/', include('ietf.doc.redirect_drafts_urls')),
|
||||
(r'^feed/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', { 'feed_dict': feeds}),
|
||||
(r'^idtracker/', include('ietf.idtracker.urls')),
|
||||
(r'^idtracker/', include('ietf.doc.redirect_idtracker_urls')),
|
||||
(r'^iesg/', include('ietf.iesg.urls')),
|
||||
(r'^ipr/', include('ietf.ipr.urls')),
|
||||
(r'^liaison/', include('ietf.liaisons.urls')),
|
||||
|
|
|
|||
Loading…
Reference in a new issue