Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/hostels/browser.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/hostels/browser.py (modified) (7 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/hostels/browser.py

@@ -93 +93 @@
 
     def title(self):
-        co = self.context.coordinates
+        co = self.context.getBedCoordinates()
         return _('Block ${a}, Room ${b}, Bed ${c}',
             mapping = {'a':co[1], 'b':co[2], 'c':co[3]})
@@ -130 +130 @@
     form_fields = grok.AutoFields(IHostelsContainer)
     taboneactions = [_('Save')]
-    tabtwoactions = [_('Add hostel'),
-        _('Clear all hostels'),
-        _('Remove selected')]
+    tabtwoactions = [_('Add hostel'), _('Remove selected')]
 
     def update(self):
@@ -166 +164 @@
         return
 
-    @jsaction(_('Clear all hostels'))
-    def clearHostels(self, **data):
-        self.context.clearAllHostels()
-        self.flash(_('All hostels cleared.'))
-        write_log_message(self, 'all hostels cleared')
-        self.redirect(self.url(self.context, '@@manage')+'?tab2')
-        return
-
     @action(_('Save'), style='primary')
     def save(self, **data):
@@ -242 +232 @@
     tabtwoactions = [_('Update all beds'),
         _('Switch reservation of selected beds'),
-        _('Release selected beds'),
-        _('Clear hostel')]
+        _('Release selected beds')]
     not_occupied = NOT_OCCUPIED
 
@@ -254 +243 @@
         tabs.need()
         datatable.need()
-        warning.need()
         self.tab1 = self.tab2 = ''
         qs = self.request.get('QUERY_STRING', '')
@@ -339 +327 @@
         return
 
-    @jsaction(_('Clear hostel'))
-    def clearHostel(self, **data):
-        self.context.clearHostel()
-        self.flash(_('Hostel cleared.'))
-        write_log_message(self, 'cleared')
-        self.redirect(self.url(self.context, '@@manage')+'?tab2')
-        return
-
 class BedManageFormPage(KofaEditFormPage):
     """ View to edit bed data
@@ -354 +334 @@
     grok.require('waeup.manageHostels')
     form_fields = grok.AutoFields(IBedAllocateStudent).omit(
-        'bed_id', 'bed_number', 'bed_type')
+        'bed_id').omit('bed_number').omit('bed_type')
     label = _('Allocate student')
     pnav = 5