Changeset 15312 for main/waeup.kofa/trunk/src/waeup

Timestamp:

29 Jan 2019, 10:24:21 (6 years ago)

Author:

Henrik Bettermann

Message:

Add 'No favoured hostel' option.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• browser.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -2165 +2165 @@
     @property
     def desired_hostel(self):
+        if self.context.desired_hostel == 'no':
+            return _('No favoured hostel')
         if self.context.desired_hostel:
             hostel = grok.getSite()['hostels'].get(self.context.desired_hostel)
@@ -2175 +2177 @@
         """
         yield(dict(name=None, title='--', selected=''))
+        selected = ''
+        if self.context.desired_hostel == 'no':
+          selected = 'selected'
+        yield(dict(name='no', title=_('No favoured hostel'), selected=selected))
         for val in grok.getSite()['hostels'].values():
             selected = ''

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -655 +655 @@
         sorted_beds = sorted(available_beds,
                 key=lambda bed: 1000 * bed.__parent__.sort_id + bed.bed_number)
-        if desired_hostel:
+        if desired_hostel and desired_hostel != 'no':
             # Filter desired hostel beds
             filtered_beds = [bed for bed in sorted_beds