change session request lock to use new meeting field: session_request_lock_message instead of lock file. commit ready for merge

 - Legacy-Id: 8320

Author: rpcross

ietf/meeting/migrations/0019_auto__add_field_meeting_session_request_lock_message.py

@@ -61,7 +61,8 @@ class Meeting(models.Model):
     reg_area = models.CharField(blank=True, max_length=255)
     agenda_note = models.TextField(blank=True, help_text="Text in this field will be placed at the top of the html agenda page for the meeting.  HTML can be used, but will not validated.")
     agenda     = models.ForeignKey('Schedule',null=True,blank=True, related_name='+')
-
+    session_request_lock_message = models.CharField(blank=True,max_length=255) # locked if not empty
+    
     def __unicode__(self):
         if self.type_id == "ietf":
             return "IETF-%s" % (self.number)

ietf/meeting/models.py

@@ -90,7 +90,7 @@ def valid_value(self, value):
 class MeetingModelForm(forms.ModelForm):
     class Meta:
         model = Meeting
-        exclude = ('type', 'agenda')
+        exclude = ('type', 'agenda', 'session_request_lock_message')
 
     def clean_number(self):
         number = self.cleaned_data['number']

ietf/secr/meetings/forms.py

@@ -4,7 +4,7 @@
 
 from ietf.person.models import Person
 from ietf.group.models import Group, GroupEvent
-from ietf.meeting.models import Meeting, Schedule, Room, TimeSlot, ScheduledSession
+from ietf.meeting.models import Meeting, Room, TimeSlot, ScheduledSession
 from ietf.utils.mail import outbox
 from ietf.meeting.test_data import make_meeting_test_data
 
@@ -43,15 +43,17 @@ def test_view(self):
 
     def test_add_meeting(self):
         "Add Meeting"
+        meeting = make_meeting_test_data()
+        number = int(meeting.number) + 1
+        count = Meeting.objects.count()
         url = reverse('meetings_add')
-        post_data = dict(number=1,city='Toronto',date='2014-07-20',country='CA',
+        post_data = dict(number=number,city='Toronto',date='2014-07-20',country='CA',
                          time_zone='America/New_York',venue_name='Hilton',
                          venue_addr='100 First Ave')
         self.client.login(username='secretary', password='secretary+password')
         response = self.client.post(url, post_data, follow=True)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(Meeting.objects.count(),1)
-        self.assertEqual(Schedule.objects.count(),1)
+        self.assertEqual(Meeting.objects.count(),count + 1)
 
     def test_edit_meeting(self):
         "Edit Meeting"

ietf/secr/meetings/tests.py

@@ -13,6 +13,7 @@
 from django.utils.functional import curry
 
 from ietf.utils.mail import send_mail
+from ietf.meeting.helpers import get_meeting
 from ietf.meeting.models import Meeting, Session, Room, TimeSlot, ScheduledSession, Schedule
 from ietf.group.models import Group, GroupEvent
 from ietf.person.models import Person
@@ -27,8 +28,6 @@
 from ietf.secr.utils.meeting import get_session, get_timeslot
 
 
-
-
 # prep for agenda changes
 # --------------------------------------------------
 # Helper Functions
@@ -295,6 +294,10 @@ def add(request):
                                                visible = True,
                                                public  = True)
             meeting.agenda = schedule
+            
+            # we want to carry session request lock status over from previous meeting
+            previous_meeting = get_meeting( int(meeting.number) - 1 )
+            meeting.session_request_lock_message = previous_meeting.session_request_lock_message
             meeting.save()
 
             #Create Physical new meeting directory and subdirectories

ietf/secr/meetings/views.py

@@ -133,4 +133,4 @@ def clean(self):
 
 class ToolStatusForm(forms.Form):
     message = forms.CharField(widget=forms.Textarea(attrs={'rows':'3','cols':'80'}))
-    
+

ietf/secr/sreq/forms.py

@@ -1,8 +1,4 @@
-import os
-import shutil
-
 from django.core.urlresolvers import reverse
-from django.conf import settings
 
 from ietf.utils.test_utils import TestCase
 from ietf.group.models import Group
@@ -66,19 +62,10 @@ def test_submit_request(self):
 """
 
 class LockAppTestCase(TestCase):
-    def setUp(self):
-        self.agenda_dir = os.path.abspath("tmp-agenda-dir")
-        os.mkdir(self.agenda_dir)
-        settings.AGENDA_PATH = self.agenda_dir
-        path = os.path.join(self.agenda_dir,'session_request.lock')
-        with open(path, 'w') as f:
-            f.write('App is locked')
-
-    def tearDown(self):
-        shutil.rmtree(self.agenda_dir)
-        
     def test_edit_request(self):
-        make_test_data()
+        meeting = make_test_data()
+        meeting.session_request_lock_message='locked'
+        meeting.save()
         group = Group.objects.get(acronym='mars')
         url = reverse('sessions_edit',kwargs={'acronym':group.acronym})
         self.client.login(username="secretary", password="secretary+password")
@@ -88,7 +75,9 @@ def test_edit_request(self):
         self.assertEqual(len(q(':disabled[name="submit"]')), 1)
 
     def test_view_request(self):
-        make_test_data()
+        meeting = make_test_data()
+        meeting.session_request_lock_message='locked'
+        meeting.save()
         group = Group.objects.get(acronym='mars')
         url = reverse('sessions_view',kwargs={'acronym':group.acronym})
         self.client.login(username="secretary", password="secretary+password")
@@ -98,7 +87,9 @@ def test_view_request(self):
         self.assertEqual(len(q(':disabled[name="edit"]')), 1)
 
     def test_new_request(self):
-        make_test_data()
+        meeting = make_test_data()
+        meeting.session_request_lock_message='locked'
+        meeting.save()
         group = Group.objects.get(acronym='mars')
         url = reverse('sessions_new',kwargs={'acronym':group.acronym})
         self.client.login(username="secretary", password="secretary+password")

ietf/secr/sreq/tests.py

@@ -1,7 +1,5 @@
 import datetime
-import os
 
-from django.conf import settings
 from django.contrib import messages
 from django.db.models import Q
 from django.http import Http404
@@ -24,16 +22,18 @@
 # Globals
 # -------------------------------------------------
 SESSION_REQUEST_EMAIL = 'session-request@ietf.org'
-LOCKFILE = os.path.join(settings.AGENDA_PATH,'session_request.lock')
+
 # -------------------------------------------------
 # Helper Functions
 # -------------------------------------------------
 
-def check_app_locked():
+def check_app_locked(meeting=None):
     '''
     This function returns True if the application is locked to non-secretariat users.
     '''
-    return os.path.exists(LOCKFILE)
+    if not meeting:
+        meeting = get_meeting()
+    return bool(meeting.session_request_lock_message)
 
 def get_initial_session(sessions):
     '''
@@ -75,17 +75,13 @@ def get_initial_session(sessions):
     initial['bethere'] = bethere_email
     return initial
 
-def get_lock_message():
+def get_lock_message(meeting=None):
     '''
     Returns the message to display to non-secretariat users when the tool is locked.
     '''
-    try:
-        f = open(LOCKFILE,'r')
-        message = f.read()
-        f.close()
-    except IOError:
-        message = "This application is currently locked."
-    return message
+    if not meeting:
+        meeting = get_meeting()
+    return meeting.session_request_lock_message
 
 def get_requester_text(person,group):
     '''
@@ -356,7 +352,7 @@ def edit_mtg(request, num, acronym):
         initial['resources'] = [x.pk for x in initial['resources']]
 
     # check if app is locked
-    is_locked = check_app_locked()
+    is_locked = check_app_locked(meeting=meeting)
     if is_locked:
         messages.warning(request, "The Session Request Tool is closed")
 
@@ -654,27 +650,26 @@ def tool_status(request):
     '''
     This view handles locking and unlocking of the tool to the public.
     '''
-    is_locked = check_app_locked()
-
+    meeting = get_meeting()
+    is_locked = check_app_locked(meeting=meeting)
+    
     if request.method == 'POST':
         button_text = request.POST.get('submit', '')
-        if button_text == 'Done':
+        if button_text == 'Back':
             return redirect('sessions')
 
         form = ToolStatusForm(request.POST)
 
         if button_text == 'Lock':
             if form.is_valid():
-                f = open(LOCKFILE,'w')
-                f.write(form.cleaned_data['message'])
-                f.close()
-
+                meeting.session_request_lock_message = form.cleaned_data['message']
+                meeting.save()
                 messages.success(request, 'Session Request Tool is now Locked')
                 return redirect('sessions')
 
         elif button_text == 'Unlock':
-            os.remove(LOCKFILE)
-
+            meeting.session_request_lock_message = ''
+            meeting.save()
             messages.success(request, 'Session Request Tool is now Unlocked')
             return redirect('sessions')
 

ietf/secr/sreq/views.py

@@ -27,7 +27,7 @@ <h2>Sessions - Status</h2>
         {% else %}
         <li><button type="submit" name="submit" value="Lock">Lock</button></li>
         {% endif %}
-        <li><button type="submit" name="submit" value="Done">Done</button></li>
+        <li><button type="submit" name="submit" value="Back">Back</button></li>
       </ul>
       </div> <!-- button-group -->