Changeset 2823 for WAeUP_SRP/base

Timestamp:

29 Nov 2007, 08:43:31 (17 years ago)

Author:

joachim

Message:

fixed as discussed

Location:

WAeUP_SRP/base

Files:

• Accommodation.py (modified) (1 diff)
• skins/waeup_accommodation/acco_folder_view.pt (modified) (2 diffs)

WAeUP_SRP/base/Accommodation.py

@@ -54 +54 @@
                                      if r]
             #for block in range(1,int(h.nr_of_blocks)+1):
-            for block in 'ABCDEFGHIJ'[:int(h.nr_of_blocks)]:
+            # for block in 'ABCDEFGHIJ'[:int(h.nr_of_blocks)]:
+            if set(h.blocks_for_female).intersection(set(h.blocks_for_male)):
+                return self.accommodation.acco_folder_view(beds_generated=beds_generated)
+            for block in h.blocks_for_female + h.blocks_for_male:
                 sex = 'male'
                 if block in h.blocks_for_female:

WAeUP_SRP/base/skins/waeup_accommodation/acco_folder_view.pt

@@ -2 +2 @@
             is_so context/isSectionOfficer;
             beds_generated options/beds_generated|nothing;"
+            psm options/psm|nothing;"
             >
   <metal:body use-macro="here/main_template/macros/master">
@@ -17 +18 @@
       </h3>
       <br />
+      <h3 tal:condition="psm" tal:content="psm"></h3>
       <table tal:condition="beds_generated">
         <tr>