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

Merged in [9779] from lars@netapp.com:

Browse source 
Remove the code that used to calculate table_rows, now that the HTML doesn't
use it anymore.
 - Legacy-Id: 9795
Note: SVN reference [9779] has been migrated to Git commit ee1ea031452864ec1df0a92eb6d2512036d7e949
This commit is contained in:
Henrik Levkowetz 2015-07-18 14:09:28 +00:00
parent f56eec6630
commit 60b126b492
2 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ietf/doc/views_doc.py
View file

@ -348,22 +348,6 @@ def document_main(request, name, rev=None):
published = doc.latest_event(type="published_rfc") published = doc.latest_event(type="published_rfc")
started_iesg_process = doc.latest_event(type="started_iesg_process") started_iesg_process = doc.latest_event(type="started_iesg_process")
# We'd like to group rows in the document information table, with a first row giving the
# group label. This would be easy if all browsers supported the rowspan="0" (zero)
# semantics of the html standard, but only Firefox and Opera do, so we have to count
# how many entries there will be in each section here, instead. Bah!
table_rows = dict(doc=4, stream=2, iesg=4, iana=2, rfced=1)
table_rows['doc'] += 1 if replaces or can_edit_stream_info else 0
table_rows['doc'] += 1 if replaced_by else 0
table_rows['doc'] += 1 if doc.get_state_slug() != "rfc" else 0
table_rows['doc'] += 1 if conflict_reviews else 0
table_rows['stream'] += 1 if consensus else 0
table_rows['stream'] += 1 if shepherd_writeup or can_edit_shepherd_writeup else 0
table_rows['stream'] += 1 if published and started_iesg_process and published.time < started_iesg_process.time else 0
table_rows['iesg'] += 1 if iesg_state and (doc.note or can_edit) else 0
return render_to_response("doc/document_draft.html", return render_to_response("doc/document_draft.html",
dict(doc=doc, dict(doc=doc,
group=group, group=group,
@ -375,9 +359,6 @@ def document_main(request, name, rev=None):
snapshot=snapshot, snapshot=snapshot,
latest_revision=latest_revision, latest_revision=latest_revision,
latest_rev=latest_rev, latest_rev=latest_rev,
table_rows=table_rows,
can_edit=can_edit, can_edit=can_edit,
can_change_stream=can_change_stream, can_change_stream=can_change_stream,
can_edit_stream_info=can_edit_stream_info, can_edit_stream_info=can_edit_stream_info,
@ -447,8 +428,6 @@ def document_main(request, name, rev=None):
can_manage = can_manage_group_type(request.user, doc.group.type_id) can_manage = can_manage_group_type(request.user, doc.group.type_id)
table_rows = dict(doc=5, wg=2, iesg=3)
return render_to_response("doc/document_charter.html", return render_to_response("doc/document_charter.html",
dict(doc=doc, dict(doc=doc,
top=top, top=top,
@ -463,7 +442,6 @@ def document_main(request, name, rev=None):
group=group, group=group,
milestones=milestones, milestones=milestones,
can_manage=can_manage, can_manage=can_manage,
table_rows=table_rows,
), ),
context_instance=RequestContext(request)) context_instance=RequestContext(request))
@ -481,9 +459,6 @@ def document_main(request, name, rev=None):
if doc.get_state_slug() in ("iesgeval") and doc.active_ballot(): if doc.get_state_slug() in ("iesgeval") and doc.active_ballot():
ballot_summary = needed_ballot_positions(doc, doc.active_ballot().active_ad_positions().values()) ballot_summary = needed_ballot_positions(doc, doc.active_ballot().active_ad_positions().values())
table_rows = dict(doc=4, wg=2, iesg=3)
table_rows['iesg'] += 1 if not snapshot else 0
return render_to_response("doc/document_conflict_review.html", return render_to_response("doc/document_conflict_review.html",
dict(doc=doc, dict(doc=doc,
top=top, top=top,
@ -495,7 +470,6 @@ def document_main(request, name, rev=None):
conflictdoc=conflictdoc, conflictdoc=conflictdoc,
ballot_summary=ballot_summary, ballot_summary=ballot_summary,
approved_states=('appr-reqnopub-pend','appr-reqnopub-sent','appr-noprob-pend','appr-noprob-sent'), approved_states=('appr-reqnopub-pend','appr-reqnopub-sent','appr-noprob-pend','appr-noprob-sent'),
table_rows=table_rows,
), ),
context_instance=RequestContext(request)) context_instance=RequestContext(request))
@ -520,9 +494,6 @@ def document_main(request, name, rev=None):
else: else:
sorted_relations=None sorted_relations=None
table_rows = dict(doc=5, wg=2, iesg=3)
table_rows['iesg'] += sorted_relations.count() if sorted_relations else 0
return render_to_response("doc/document_status_change.html", return render_to_response("doc/document_status_change.html",
dict(doc=doc, dict(doc=doc,
top=top, top=top,
@ -534,7 +505,6 @@ def document_main(request, name, rev=None):
ballot_summary=ballot_summary, ballot_summary=ballot_summary,
approved_states=('appr-pend','appr-sent'), approved_states=('appr-pend','appr-sent'),
sorted_relations=sorted_relations, sorted_relations=sorted_relations,
table_rows=table_rows,
), ),
context_instance=RequestContext(request)) context_instance=RequestContext(request))

5
ietf/group/info.py
View file

@ -430,17 +430,12 @@ def group_about(request, acronym, group_type=None):
can_manage = can_manage_group_type(request.user, group.type_id) can_manage = can_manage_group_type(request.user, group.type_id)
table_rows = dict(group=5, personnel=0, )
table_rows["group"] += 1 if group.groupurl_set.count() else 0
table_rows["personnel"] += len(group.personnel)
return render(request, 'group/group_about.html', return render(request, 'group/group_about.html',
construct_group_menu_context(request, group, "charter" if group.features.has_chartering_process else "about", group_type, { construct_group_menu_context(request, group, "charter" if group.features.has_chartering_process else "about", group_type, {
"milestones_in_review": group.groupmilestone_set.filter(state="review"), "milestones_in_review": group.groupmilestone_set.filter(state="review"),
"milestone_reviewer": milestone_reviewer_for_group_type(group_type), "milestone_reviewer": milestone_reviewer_for_group_type(group_type),
"requested_close": requested_close, "requested_close": requested_close,
"can_manage": can_manage, "can_manage": can_manage,
"table_rows": table_rows,
})) }))