altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged [3599] from rjsparks@nostrum.com:

Browse source 
Changed the AD status page to group documents by current state.
Fixes bug 742
 - Legacy-Id: 3607
Note: SVN reference [3599] has been migrated to Git commit 6b6e51a665
This commit is contained in:
Henrik Levkowetz 2011-11-12 09:15:13 +00:00
parent aaa2780274 6b6e51a665
commit d51adcf2b3
6 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ietf/idrfc/idrfc_wrapper.py
View file

@ -30,7 +30,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from ietf.idtracker.models import InternetDraft, IDInternal, BallotInfo, IESGDiscuss, IESGLogin, DocumentComment, Acronym
from ietf.idtracker.models import InternetDraft, IDInternal, BallotInfo, IESGDiscuss, IESGLogin, DocumentComment, Acronym, IDState
from ietf.idrfc.models import RfcEditorQueue
from ietf.ipr.models import IprRfc, IprDraft, IprDetail
@ -578,6 +578,20 @@ class IdRfcWrapper:
else:
return 'Old Internet-Draft'
def view_sort_group_byad(self):
if self.rfc:
return 'RFC'
elif self.id.draft_status == "Active":
if self.id.in_ietf_process():
if self.id.ietf_process._idinternal.cur_state_id == IDState.DEAD:
return 'IESG Dead Internet-Draft'
else:
return "%s Internet-Draft" % self.id.ietf_process._idinternal.cur_state
else:
return 'Active Internet-Draft'
else:
return 'Old Internet-Draft'
def view_sort_key(self, sort_by=None):
if sort_by is None:
if self.rfc:

18
ietf/meeting/views.py
View file

@ -234,14 +234,16 @@ def session_draft_list(num, session):
drafts = set(re.findall('(draft-[-a-z0-9]*)',agenda))
for draft in drafts:
if (re.search('-[0-9]{2}$',draft)):
doc_name = draft
else:
id = get_object_or_404(InternetDraft, filename=draft)
doc = IdWrapper(id)
doc_name = draft + "-" + id.revision
result.append(doc_name)
try:
if (re.search('-[0-9]{2}$',draft)):
doc_name = draft
else:
id = InternetDraft.objects.get(filename=draft)
doc = IdWrapper(id)
doc_name = draft + "-" + id.revision
result.append(doc_name)
except InternetDraft.DoesNotExist:
pass
return sorted(list(set(result)))

1
ietf/settings.py
View file

@ -73,6 +73,7 @@ ADMIN_MEDIA_PREFIX = '/media/'
AUTH_PROFILE_MODULE = 'ietfauth.IetfUserProfile'
AUTHENTICATION_BACKENDS = ( "ietf.ietfauth.auth.IetfUserBackend", )
SESSION_COOKIE_AGE = 43200 # 12 hours
SESSION_EXPIRE_AT_BROWSER_CLOSE = True

2
ietf/templates/idrfc/by_ad.html
View file

@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{% block content %}
<h1>Internet-Drafts and RFCs for {{ ad_name }}</h1>
{% regroup docs by view_sort_group as grouped_docs %}
{% regroup docs by view_sort_group_byad as grouped_docs %}
<table class="ietf-table ietf-doctable">
<tr><th class="doc">Document</th><th class="title">Title</th><th class="date">Date</th><th class="status" colspan="2">Status</th><th class="ipr">ipr</th><th class="ad">Area Director</th></tr>

2
ietf/templates/submit/announce_to_lists.txt
View file

@ -1,3 +1,4 @@
{% autoescape off %}
A New Internet-Draft is available from the on-line Internet-Drafts directories.{% if submission.group_acronym %} This draft is a work item of the {{ submission.group_acronym.group_acronym.name }} Working Group of the IETF.{% endif %}
Title : {{ submission.id_document_name }}
@ -17,3 +18,4 @@ ftp://ftp.ietf.org/internet-drafts/
This Internet-Draft can be retrieved at:
ftp://ftp.ietf.org/internet-drafts/{{ submission.filename }}-{{ submission.revision }}.txt
{% endautoescape %}

2
test/mkrelease
View file

@ -230,7 +230,7 @@ Regards,
Henrik
(via the mkrelease script)
" | $do mail -s "New datatracker release: v$VER" -c henrik@levkowetz.com -c glen@amsl.com -c fenner@fenron.net -c rjs@nostrum.com -c housley@vigilsec.com -c cmorgan@amsl.com -c avezza@amsl.com -c amorris@amsl.com -c smccammon@amsl.com -c kmoreland@amsl.com -c stevey@amsl.com $contributors codesprints@ietf.org
" | $do mail -s "New datatracker release: v$VER" -c henrik@levkowetz.com -c glen@amsl.com -c fenner@fenron.net -c rjs@nostrum.com -c housley@vigilsec.com -c cmorgan@amsl.com -c avezza@amsl.com -c amorris@amsl.com -c smccammon@amsl.com -c kmoreland@amsl.com -c stevey@amsl.com -c olau@iola.dk $contributors codesprints@ietf.org
$do toolsfeed control changelog /www/tools.ietf.org/tools/atomfeed.xml
$do toolpush /www/tools.ietf.org/tools/atomfeed.xml