Um... reverting counter-productive merge with trunk.

 - Legacy-Id: 2962

Author: shane-kerr

shane/ietf/cookies/views.py

@@ -35,7 +35,7 @@ def new_enough(request, days="14"):
     if days == 0:
         days = 14
     response = settings(request, days, -1)
-    response.set_cookie("new_enough", days, 315360000)
+    response.set_cookie("new_enough", days)
     return response
 
 def expires_soon(request, days="14"):
@@ -46,12 +46,12 @@ def expires_soon(request, days="14"):
     if days == 0:
         days = 14
     response = settings(request, -1, days)
-    response.set_cookie("expires_soon", days, 315360000)
+    response.set_cookie("expires_soon", days)
     return response
 
 def full_draft(request, enabled="off"):
     if enabled != "on" and enabled != "off":
             enabled = "off"
     response = settings(request, -1, -1, enabled)
-    response.set_cookie("full_draft", enabled, 315360000)
+    response.set_cookie("full_draft", enabled)
     return response

shane/ietf/idrfc/idrfc_wrapper.py

@@ -38,8 +38,6 @@
 from datetime import date
 from django.utils import simplejson as json
 from django.db.models import Q
-from django.db import models
-from django.core.urlresolvers import reverse
 import types
 
 BALLOT_ACTIVE_STATES = ['In Last Call',
@@ -200,11 +198,11 @@ def draft_name_and_revision(self):
 
     def friendly_state(self):
         if self.draft_status == "RFC":
-            return "<a href=\"%s\">RFC %d</a>" % (reverse('doc_view', args=['rfc%d' % self.rfc_number]), self.rfc_number)
+            return "<a href=\"/doc/rfc%d/\">RFC %d</a>" % (self.rfc_number, self.rfc_number)
         elif self.draft_status == "Replaced":
             rs = self.replaced_by()
             if rs:
-                return "Replaced by <a href=\"%s\">%s</a>" % (reverse('ipr_show', args=[rs[0]]),rs[0]) 
+                return "Replaced by <a href=\"/doc/%s/\">%s</a>" % (rs[0],rs[0])
             else:
                 return "Replaced"
         elif self.draft_status == "Active":
@@ -359,9 +357,8 @@ def ad_name(self):
             # TODO: get AD name of the draft
             return None
 
-    @models.permalink
     def get_absolute_url(self):
-        return ('ietf.idrfc.views_doc.document_main', ['rfc%s' % (str(self.rfc_number))])
+        return "/doc/rfc%d/" % (self.rfc_number,)
     def displayname_with_link(self):
         return '<a href="%s">RFC %d</a>' % (self.get_absolute_url(), self.rfc_number)
 
@@ -758,8 +755,6 @@ def create_position_object(ballot, position, all_comments):
              position=p)
     if not position.ad.is_current_ad():
         r['is_old_ad'] = True
-    else:
-        r['is_old_ad'] = False
 
     was = [v for k,v in positions.iteritems() if position.__dict__[k] < 0]
     if len(was) > 0:

shane/ietf/idrfc/urls.py

@@ -38,7 +38,6 @@
     (r'^search/$', views_search.search_results),
     (r'^all/$', views_search.all),
     (r'^active/$', views_search.active),
-    (r'^in-last-call/$', views_search.in_last_call),
     url(r'^ad/(?P<name>[A-Za-z0-9.-]+)/$', views_search.by_ad, name="doc_search_by_ad"),
 
     url(r'^(?P<name>[A-Za-z0-9.-]+)/((?P<tab>ballot|writeup|history)/)?$', views_doc.document_main, name="doc_view"),

shane/ietf/idrfc/views_ballot.py

@@ -21,8 +21,6 @@
 from ietf.idrfc.mails import *
 from ietf.idrfc.utils import *
 from ietf.idrfc.lastcall import request_last_call
-from ietf.idrfc.idrfc_wrapper import BallotWrapper
-
 
 BALLOT_CHOICES = (("yes", "Yes"),
                   ("noobj", "No Objection"),
@@ -188,7 +186,6 @@ def edit_position(request, name):
                                    comment=comment,
                                    ad=ad,
                                    return_to_url=return_to_url,
-                                   ballot=BallotWrapper(doc.idinternal)
                                    ),
                               context_instance=RequestContext(request))
 

shane/ietf/idrfc/views_doc.py

@@ -41,7 +41,6 @@
 from django.utils import simplejson as json
 from django.utils.decorators import decorator_from_middleware
 from django.middleware.gzip import GZipMiddleware
-from django.core.urlresolvers import reverse
 
 from ietf import settings
 from ietf.idtracker.models import InternetDraft, IDInternal, BallotInfo, DocumentComment
@@ -190,7 +189,7 @@ def _get_history(doc, versions):
         results.append({'is_text':True, 'date':doc._draft.expiration_date, 'text':'Draft expired'})
     if doc.is_rfc_wrapper:
         if doc.draft_name:
-            text = 'RFC Published (see <a href="%s">%s</a> for earlier history)' % (reverse('doc_view', args=[doc.draft_name]),doc.draft_name)
+            text = 'RFC Published (see <a href="/doc/%s/">%s</a> for earlier history)' % (doc.draft_name,doc.draft_name)
         else:
             text = 'RFC Published'
         results.append({'is_text':True, 'date':doc.publication_date, 'text':text})

shane/ietf/idrfc/views_search.py

@@ -324,7 +324,3 @@ def active(request):
     groups = IETFWG.objects.exclude(group_acronym=1027)
     individual = IETFWG.objects.get(group_acronym=1027)
     return render_to_response("idrfc/active.html", {'groups':groups,'individual':individual}, context_instance=RequestContext(request))
-
-def in_last_call(request):
-    lcdocs = [IdWrapper(p) for p in InternetDraft.objects.all().filter(idinternal__primary_flag=1).filter(idinternal__cur_state__state='In Last Call')]
-    return render_to_response("idrfc/in_last_call.html", {'lcdocs':lcdocs}, context_instance=RequestContext(request))

shane/ietf/iesg/views.py

@@ -49,7 +49,6 @@
 from ietf.idrfc.utils import update_telechat
 from ietf.ietfauth.decorators import group_required
 from ietf.idtracker.templatetags.ietf_filters import in_group
-from ietf.ipr.models import IprRfc, IprDraft, IprDetail
 import datetime 
 import tarfile
 
@@ -288,17 +287,11 @@ def agenda_documents(request):
             section_key = "s" + get_doc_section(i)
             if section_key not in res:
                 res[section_key] = []
-            # PM - add code to fill in IPR details. (Would be better to use IdRfc_Wrapper - but this breaks other code
             if not i.rfc_flag:
                 w = IdWrapper(draft=i)
-                w.iprUrl = "/ipr/search?option=document_search&id_document_tag=" + str(w.id.tracker_id)
-                iprs = IprDraft.objects.filter(document=w.id.tracker_id)
             else:
                 ri = RfcIndex.objects.get(rfc_number=i.draft_id)
                 w = RfcWrapper(ri)
-                w.iprUrl = "/ipr/search?option=rfc_search&rfc_search=" + str(w.rfc.rfc_number)
-                iprs = IprRfc.objects.filter(document=w.rfc.rfc_number) 
-            w.iprCount = len(iprs)
             w.reschedule_form = i.reschedule_form
             res[section_key].append(w)
         telechats.append({'date':date, 'docs':res})

shane/ietf/ipr/feeds.py

@@ -3,13 +3,12 @@
 from django.contrib.syndication.feeds import Feed
 from django.utils.feedgenerator import Atom1Feed
 from ietf.ipr.models import IprDetail
-from ietf.utils.lazy import reverse_lazy
 from datetime import datetime, time
 
 class LatestIprDisclosures(Feed):
     feed_type = Atom1Feed
     title = "IPR Disclosures to the IETF"
-    link = reverse_lazy('ipr_showlist')
+    link = "/ipr/"
     description = "Updates on new IPR Disclosures made to the IETF."
     language = "en"
     feed_url = "/feed/ipr/"

shane/ietf/ipr/models.py

@@ -4,7 +4,6 @@
 #from django import newforms as forms
 from ietf.idtracker.views import InternetDraft
 from ietf.idtracker.models import Rfc
-from ietf.utils.lazy import reverse_lazy
 
 # ------------------------------------------------------------------------
 # Models
@@ -116,9 +115,8 @@ def __str__(self):
 	return self.title
     def docs(self):
         return list(self.drafts.all()) + list(self.rfcs.all())
-    @models.permalink
     def get_absolute_url(self):
-        return ('ietf.ipr.views.show', [str(self.ipr_id)])
+        return "/ipr/%d/" % self.ipr_id
     def get_submitter(self):
 	try:
 	    return self.contact.get(contact_type=3)

shane/ietf/ipr/urls.py

@@ -1,16 +1,15 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls.defaults import patterns
 from ietf.ipr import views, new, search
-from ietf.utils.lazy import reverse_lazy
 from django.views.generic.simple import redirect_to
 
 urlpatterns = patterns('',
-     url(r'^$', views.showlist, name='ipr_showlist'),
+     (r'^$', views.showlist),
      (r'^about/$', views.default),
      (r'^by-draft/$', views.list_drafts),
-     url(r'^(?P<ipr_id>\d+)/$', views.show, name='ipr_show'),
-     (r'^update/$', redirect_to, { 'url': reverse_lazy('ipr_showlist') }),
+     (r'^(?P<ipr_id>\d+)/$', views.show),
+     (r'^update/$', redirect_to, { 'url': '/ipr/' }),
      (r'^update/(?P<ipr_id>\d+)/$', new.update),
      (r'^new-(?P<type>specific)/$', new.new),
      (r'^new-(?P<type>generic)/$', new.new),