From 1ba03ae26eab98ef22267eb81f8e6ecc6c1d6f25 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 24 Jul 2009 15:05:50 +0000 Subject: [PATCH] Committing code merged in from Pasi. - Legacy-Id: 1510 --- ietf/idrfc/idrfc_wrapper.py | 2 +- ietf/iesg/feeds.py | 20 -------------------- ietf/iesg/sitemaps.py | 6 ------ ietf/iesg/urls.py | 22 +++------------------- ietf/iesg/views.py | 2 +- ietf/templates/idrfc/base_leftmenu.html | 8 ++++---- ietf/urls.py | 5 +---- 7 files changed, 10 insertions(+), 55 deletions(-) delete mode 100644 ietf/iesg/sitemaps.py diff --git a/ietf/idrfc/idrfc_wrapper.py b/ietf/idrfc/idrfc_wrapper.py index 34c538cc8..23b1cf3b1 100644 --- a/ietf/idrfc/idrfc_wrapper.py +++ b/ietf/idrfc/idrfc_wrapper.py @@ -278,7 +278,7 @@ class RfcWrapper: if self.in_ietf_process(): s = self.ietf_process.main_state if not s in ["RFC Published", "AD is watching", "Dead"]: - return "RFC %d (%s)
%s (to %s)" % (self.rfc_number, self.maturity_level, s, self.ietf_process.intended_maturity_level()) + return "RFC %d (%s)
%s (to %s)" % (self.rfc_number, self.maturity_level, self.ietf_process.state, self.ietf_process.intended_maturity_level()) return "RFC %d (%s)" % (self.rfc_number, self.maturity_level) def ad_name(self): diff --git a/ietf/iesg/feeds.py b/ietf/iesg/feeds.py index 3ae079255..31047dc4e 100644 --- a/ietf/iesg/feeds.py +++ b/ietf/iesg/feeds.py @@ -2,29 +2,9 @@ from django.contrib.syndication.feeds import Feed from django.utils.feedgenerator import Atom1Feed -from ietf.iesg.models import TelechatMinutes from ietf.idtracker.models import IDInternal import datetime -class IESGMinutes(Feed): - title = "IESG Telechat Minutes" - link = "/iesg/telechat/" - subtitle = "Minutes from IESG Telechats." - feed_type = Atom1Feed - author_name = 'IESG Secretary' - - def items(self): - return TelechatMinutes.objects.order_by('-telechat_date')[:10] - - def item_link(self, item): - return "/iesg/telechat/%d/" % (item.id) - - # The approval date isn't stored, so let's just say they're - # published on the date of the telechat. - def item_pubdate(self, item): - # (slightly better would be 0900 Eastern on this date) - return item.telechat_date - class IESGAgenda(Feed): title = "IESG Telechat Agenda" link = "http://www.ietf.org/IESG/agenda.html" diff --git a/ietf/iesg/sitemaps.py b/ietf/iesg/sitemaps.py deleted file mode 100644 index 9d06d20ae..000000000 --- a/ietf/iesg/sitemaps.py +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright The IETF Trust 2007, All Rights Reserved -# -from django.contrib.sitemaps import GenericSitemap -from ietf.iesg.urls import telechat_detail - -IESGMinutesMap = GenericSitemap(telechat_detail, changefreq="never") diff --git a/ietf/iesg/urls.py b/ietf/iesg/urls.py index 97104dbf6..ee085c03f 100644 --- a/ietf/iesg/urls.py +++ b/ietf/iesg/urls.py @@ -35,31 +35,15 @@ from django.conf.urls.defaults import patterns from django.conf import settings from ietf.iesg import views -from ietf.iesg.models import TelechatMinutes from ietf.idtracker.models import BallotInfo -#urlpatterns = patterns('django.views.generic.list_detail', -# (r'^lastcall/$', 'object_list', { -# 'queryset': InternetDraft.objects.all() }), -#) - -queryset = TelechatMinutes.objects.all() -telechat_detail = { - 'queryset': queryset, - 'date_field': 'telechat_date', -} -telechat_archive = dict(telechat_detail, allow_empty=True) - queryset_ann = BallotInfo.objects.all() -urlpatterns = patterns('django.views.generic.date_based', - (r'^telechat/$', 'archive_index', telechat_archive), - (r'^telechat/y/(?P\d{4})/$', 'archive_year', telechat_archive), - (r'^telechat/y/(?P\d{4})/(?P[a-z]{3})/$', 'archive_month', telechat_archive), -) +urlpatterns = patterns('', + (r'^telechat/.*$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/iesg/minutes.html' }) +) urlpatterns += patterns('django.views.generic.list_detail', - (r'^telechat/(?P\d+)/$', 'object_detail', { 'queryset': queryset }), (r'^ann/(?P\d+)/$', 'object_detail', { 'queryset': queryset_ann, 'template_name':"iesg/ballotinfo_detail.html" }), ) diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py index c082339f7..bafa9e612 100644 --- a/ietf/iesg/views.py +++ b/ietf/iesg/views.py @@ -198,7 +198,7 @@ def discusses(request): except RfcIndex.DoesNotExist: # NOT QUITE RIGHT, although this should never happen pass - if len(draft) > 0 and draft[0].draft.id_document_tag not in ids: + if len(draft) > 0 and not draft[0].rfc_flag and draft[0].draft.id_document_tag not in ids: ids.add(draft[0].draft.id_document_tag) doc = IdWrapper(draft=draft[0]) if doc.in_ietf_process() and doc.ietf_process.has_active_iesg_ballot(): diff --git a/ietf/templates/idrfc/base_leftmenu.html b/ietf/templates/idrfc/base_leftmenu.html index f9341f74a..682c9811f 100644 --- a/ietf/templates/idrfc/base_leftmenu.html +++ b/ietf/templates/idrfc/base_leftmenu.html @@ -64,15 +64,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  • Meetings
  • Agenda
    • -
  • Materials
    • +
  • Materials
  • Room maps
    • -
  • Past Proceedings
    • -
  • Upcoming Meetings
    • +
  • Past Proceedings
    • +
  • Upcoming Meetings
  • Other documents
  • IPR Disclosures
  • Liaison Statements
    • -
  • IESG Minutes
    • +
  • IESG Minutes
  • Related sites
  • Main IETF site
    • diff --git a/ietf/urls.py b/ietf/urls.py index 7bc39c490..0cc9eb912 100644 --- a/ietf/urls.py +++ b/ietf/urls.py @@ -2,7 +2,7 @@ from django.conf.urls.defaults import patterns, include, handler404, handler500 -from ietf.iesg.feeds import IESGMinutes, IESGAgenda +from ietf.iesg.feeds import IESGAgenda from ietf.idtracker.feeds import DocumentComments, InLastCall from ietf.ipr.feeds import LatestIprDisclosures from ietf.proceedings.feeds import LatestWgProceedingsActivity @@ -11,13 +11,11 @@ from ietf.liaisons.feeds import Liaisons from ietf.idtracker.sitemaps import IDTrackerMap, DraftMap from ietf.liaisons.sitemaps import LiaisonMap from ietf.ipr.sitemaps import IPRMap -from ietf.iesg.sitemaps import IESGMinutesMap from ietf.announcements.sitemaps import NOMCOMAnnouncementsMap from django.conf import settings feeds = { - 'iesg-minutes': IESGMinutes, 'iesg-agenda': IESGAgenda, 'last-call': InLastCall, 'comments': DocumentComments, @@ -31,7 +29,6 @@ sitemaps = { 'drafts': DraftMap, 'liaison': LiaisonMap, 'ipr': IPRMap, - 'iesg-minutes': IESGMinutesMap, 'nomcom-announcements': NOMCOMAnnouncementsMap, }