Changeset 9534

Timestamp:

5 Nov 2012, 10:31:06 (12 years ago)

Author:

Henrik Bettermann

Message:

List reserved beds in row not in a column.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/hostels

Files:

• browser.py (modified) (2 diffs)
• browser_templates/hostelmanagepage.pt (modified) (1 diff)
• browser_templates/hostelpage.pt (added)
• tests.py (modified) (1 diff)

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

@@ -213 +213 @@
     grok.name('index')
     grok.require('waeup.viewHostels')
-    #grok.template('hostelpage')
+    grok.template('hostelpage')
+    form_fields = grok.AutoFields(IHostel).omit('beds_reserved')
     pnav = 5
 
@@ -234 +235 @@
     grok.name('manage')
     grok.require('waeup.manageHostels')
-    form_fields = grok.AutoFields(IHostel).omit('hostel_id')
-    form_fields['beds_reserved'].for_display = True
+    form_fields = grok.AutoFields(IHostel).omit('hostel_id', 'beds_reserved')
     grok.template('hostelmanagepage')
     label = _('Manage hostel')

main/waeup.kofa/trunk/src/waeup/kofa/hostels/browser_templates/hostelmanagepage.pt

@@ -16 +16 @@
       <tbody>
         <tal:widgets content="structure provider:widgets" />
+        <tr>
+          <td class="fieldname" i18n:translate="" >
+            Reserved Beds:
+          </td>
+          <td>
+            <tal:repeat repeat="bed context/beds_reserved" >
+                <span tal:replace='bed'>BED</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            </tal:repeat>
+          </td>
+        </tr>
       </tbody>
       </table>

main/waeup.kofa/trunk/src/waeup/kofa/hostels/tests.py

@@ -273 +273 @@
         self.assertEqual(self.app['hostels']['hall-1'][
             'hall-1_A_101_D'].bed_type, 'regular_female_reserved')
-        self.assertTrue('<div>A_101_A</div>' in self.browser.contents)
+        self.assertTrue('A_101_A&nbsp;&nbsp;' in self.browser.contents)
         # The catalog has been updated
         results = cat.searchResults(