Merged in the contents of commit [6337] from mcr@sandelman.ca, with some changes to take out dead code that inadvertently came back in.

 - Legacy-Id: 6344
Note: SVN reference [6337] has been migrated to Git commit d0d1d94

Author: levkowetz

changelog

@@ -1,3 +1,51 @@
+ietfdb (4.80) ietf; urgench=high
+
+  This is a major release which provides the code drop from phase 3 of the
+  Agenda Scheduling Tool.  The code has been merged in, and a lot of minor
+  alignments done.  Deployment of this will make the phase 3 agenda editing
+  tools available from the main ietf site, will align the database schema with
+  that used in the ongoing development work, and will provide the correct
+  models for secretariat tool adaptations.
+
+  * Reworked the TestCase code and fixture loading substantially, resulting
+    in a substantial speed increase for tests when run on a transaction-
+    capable database engine.
+
+  * Added an index page for nomcoms, at /nomcom/, with links to nomcom 
+    pages and announcements, where they exist.
+
+  * Fixed some bugs in the EncryptedTextField class.
+
+  * Fixed the language of the nomination confirmation message.
+
+  * Changed 'requirement' to 'desired expertise' in user-visible places in 
+    the nomcom app.
+
+  * Fixed a wrong secretariat template extension name.
+
+  * Provide the missing safe_rep function required in the back-ported 
+    assertIsNone() test case method.
+
+  * Added an explanatory paragraph to the Desired Expertise page.
+
+  * The exception string for submission upload read errors seems to have 
+    changed after we switched to wsgi, from "Client read error" to "request 
+    data read error".  Now looking for just "read error".
+
+  * Tweaked the introductory text on the Desired Expertise page.
+
+  * Added a makefixture management command, from 
+    http://djangosnippets.org/snippets/918/, somewhat hacked.
+
+  * Updated fixtures, built to be more internally consistent in order to be 
+    able to pre-load them for the test suite.
+
+  * Fixed the manyfold duplicated position names in the position selection 
+    drop-down list in the nomcom private index page.  Fixes issue #1137.
+
+ -- Henrik Levkowetz <henrik@netnod.se>  01 Oct 2013 16:54:16 +0200
+
+
 ietfdb (4.72) ietf; urgency=medium
 
   * Added a migration for a new ConstraintName field: penalty

ietf/group/models.py

@@ -11,7 +11,7 @@
 
 import datetime
 import debug
-    
+
 class GroupInfo(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)
     name = models.CharField(max_length=80)
@@ -101,10 +101,14 @@ def json_dict(self, host_scheme):
         group1['name']    = self.name
         group1['state']   = self.state.slug
         group1['type']    = self.type.slug
-        group1['parent_href']  = urljoin(host_scheme, self.parent.json_url())
+        if self.parent is not None:
+            group1['parent_href']  = urljoin(host_scheme, self.parent.json_url())
         # uncomment when people URL handle is created
-        #if self.ad is not None:
-        #    group1['ad_href']      = urljoin(host_scheme, self.ad.url())
+        try:
+            if self.ad is not None:
+                group1['ad_href']      = urljoin(host_scheme, self.ad.json_url())
+        except Person.DoesNotExist:
+            pass
         group1['list_email'] = self.list_email
         group1['list_subscribe'] = self.list_subscribe
         group1['list_archive'] = self.list_archive

ietf/meeting/ajax.py

@@ -28,8 +28,13 @@
 
 log = logging.getLogger(__name__)
 
+import debug
+
 @dajaxice_register
 def readonly(request, meeting_num, schedule_id):
+    debug.say('readonly()')
+    debug.show('meeting_num')
+    debug.show('schedule_id')
     meeting = get_meeting(meeting_num)
     schedule = get_schedule_by_id(meeting, schedule_id)
 
@@ -61,6 +66,30 @@ def readonly(request, meeting_num, schedule_id):
          'owner_href':  request.build_absolute_uri(schedule.owner.json_url()),
          'read_only':   read_only})
 
+@group_required('Area Director','Secretariat')
+@dajaxice_register
+def update_timeslot_pinned(request, schedule_id, scheduledsession_id, pinned=False):
+    schedule = get_object_or_404(Schedule, pk = int(schedule_id))
+    meeting  = schedule.meeting
+    cansee,canedit = agenda_permissions(meeting, schedule, request.user)
+
+    if not canedit:
+        raise Http403
+        return json.dumps({'error':'no permission'})
+
+    if scheduledsession_id is not None:
+        ss_id = int(scheduledsession_id)
+
+    if ss_id != 0:
+        ss = get_object_or_404(schedule.scheduledsession_set, pk=ss_id)
+
+    ss.pinned = pinned
+    ss.save()
+
+    return json.dumps({'message':'valid'})
+
+
+
 @group_required('Area Director','Secretariat')
 @dajaxice_register
 def update_timeslot(request, schedule_id, session_id, scheduledsession_id=None, extended_from_id=None, duplicate=False):
@@ -458,14 +487,36 @@ def session_json(request, num, sessionid):
     try:
         session = meeting.session_set.get(pk=int(sessionid))
     except Session.DoesNotExist:
-        return json.dumps({'error':"no such session %s" % sessionid})
+#        return json.dumps({'error':"no such session %s" % sessionid})
+        return HttpResponse(json.dumps({'error':"no such session %s" % sessionid}),
+                            status = 404,
+                            mimetype="application/json")
 
     sess1 = session.json_dict(request.build_absolute_uri('/'))
     return HttpResponse(json.dumps(sess1, sort_keys=True, indent=2),
                         mimetype="application/json")
 
 # Would like to cache for 1 day, but there are invalidation issues.
 #@cache_page(86400)
+def constraint_json(request, num, constraintid):
+    meeting = get_meeting(num)
+
+    try:
+        constraint = meeting.constraint_set.get(pk=int(constraintid))
+    except Constraint.DoesNotExist:
+        return HttpResponse(json.dumps({'error':"no such constraint %s" % constraintid}),
+                            status = 404,
+                            mimetype="application/json")
+
+    json1 = constraint.json_dict(request.get_host_protocol())
+    return HttpResponse(json.dumps(json1, sort_keys=True, indent=2),
+                        mimetype="application/json")
+
+
+# Cache for 2 hour2
+#@cache_page(7200)
+# caching is a problem if there Host: header changes.
+#
 def session_constraints(request, num, sessionid):
     meeting = get_meeting(num)
 

ietf/meeting/fixtures/constraint83.json

@@ -1454,5 +1454,9 @@
 {"pk": 22491, "model": "meeting.constraint", "fields": {"source": 1847, "meeting": 83, "target": 1751, "name": "conflic2"}},
 {"pk": 22492, "model": "meeting.constraint", "fields": {"source": 1847, "meeting": 83, "target": 1817, "name": "conflic2"}},
 {"pk": 22493, "model": "meeting.constraint", "fields": {"source": 1847, "meeting": 83, "target": 1728, "name": "conflic2"}},
-{"pk": 22494, "model": "meeting.constraint", "fields": {"source": 1847, "meeting": 83, "target": 1789, "name": "conflic2"}}
-]
+{"pk": 22494, "model": "meeting.constraint", "fields": {"source": 1847, "meeting": 83, "target": 1789, "name": "conflic2"}},
+{"pk": 23000, "model": "meeting.constraint", "fields": {"source": 1816, "meeting": 83, "name": "bethere", "person": 103539}},
+{"pk": 23001, "model": "meeting.constraint", "fields": {"source": 1816, "meeting": 83, "name": "bethere", "person": 108554}},
+{"pk": 23002, "model": "meeting.constraint", "fields": {"source": 1816, "meeting": 83, "name": "bethere", "person": 102830}}
+
+]

ietf/meeting/helpers.py

@@ -10,8 +10,11 @@
 
 from django import forms
 from django.http import Http404
+from django.http import HttpRequest
 from django.db.models import Max, Q
 from django.conf import settings
+from django.core.cache import cache
+from django.utils.cache import get_cache_key
 
 import debug
 import urllib
@@ -344,3 +347,15 @@ def agenda_permissions(meeting, schedule, user):
         canedit = True
 
     return cansee,canedit
+
+def session_constraint_expire(session):
+    from django.core.urlresolvers import reverse
+    from ajax import session_constraints
+    path = reverse(session_constraints, args=[session.meeting.number, session.pk])
+    request = HttpRequest()
+    request.path = path
+    key = get_cache_key(request)
+    if key is not None and cache.has_key(key):
+        cache.delete(key)
+
+