Changeset 849

Timestamp:

12 Nov 2006, 07:27:27 (18 years ago)

Author:

Henrik Bettermann

Message:

accommodation_pin_form renamed
student action 'Book Hostel' moved to student_navigation 'My Accommodation'
StudentAccommodation? object always invisible for student in in student_view

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/actionicons.xml (modified) (2 diffs)
• profiles/default/actions.xml (modified) (1 diff)
• skins/waeup_student/accommodation_pin_edit_form.pt (added)
• skins/waeup_student/accommodation_pin_form.pt (deleted)
• skins/waeup_student/getStudentInfo.py (modified) (1 diff)
• skins/waeup_student/reserve_accommodation.py (modified) (3 diffs)

WAeUP_SRP/trunk/profiles/default/actionicons.xml

@@ -229 +229 @@
               action_id="registration" title="My Study"
               priority="1" icon_expr="blank.gif"/>
+ <action-icon category="student_navigation" 
+              action_id="reserve_accommodation"
+              title="My Accommodation" priority="2"
+              icon_expr="blank.gif"/>
  <action-icon category="student_navigation"
               action_id="prospectus" title="Prospectus"
-              priority="2" icon_expr="blank.gif"/>
- <action-icon category="student_navigation" 
-              action_id="contact_student" title="Contact" 
-              priority="3" icon_expr="blank.gif"/>              
+              priority="3" icon_expr="blank.gif"/>
+ <action-icon category="student_navigation"
+              action_id="contact_student" title="Support"
+              priority="4" icon_expr="blank.gif"/>
  <action-icon category="student_object" action_id="slip"
               title="Acknowledegement Slip" priority="1"
@@ -250 +254 @@
               title="Check if admitted" priority="3"
               icon_expr="bell.png"/>
- <action-icon category="student" action_id="reserve_accommodation"
-              title="Book Hostel" priority="3"
-              icon_expr="bell.png"/>
  <action-icon category="student" action_id="register_courses"
               title="Register Courses" priority="4"

WAeUP_SRP/trunk/profiles/default/actions.xml

@@ -161 +161 @@
   </action>
 
-  <action title="Book Hostel" action_id="reserve_accommodation"
-     category="student" condition_expr="member"
+  <action title="My Accommodation" action_id="reserve_accommodation"
+     category="student_navigation" condition_expr="member"
      url_expr="string:${portal_url}/reserve_accommodation" visible="True"/>
    <permission>View</permission>

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -124 +124 @@
         row['s_edit_link'] = "%s/%s" % (soo.absolute_url(),se_link)
     row['review_state'] = so.review_state
-    row['display'] = so.review_state in ('opened','closed','public','bed_reserved',) #or\
-                     #so.portal_type in ("StudentAccommodation","StudentStudyCourse")
+    row['display'] = so.review_state in ('opened','closed',)
     items.append(row)
 info['items'] = items

WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

@@ -47 +47 @@
                       )
 if psm == 'invalid':
-    return context.accommodation_pin_form(rendered = res,
+    return context.accommodation_pin_edit_form(rendered = res,
                                  psm = "Please correct your input.",
                                  #psm = "%s, %s" % (psm,ds),
@@ -54 +54 @@
                                  )
 elif psm == '':
-    return context.accommodation_pin_form(rendered = res,
+    return context.accommodation_pin_edit_form(rendered = res,
                                  psm = None,
                                  mode = mode,
@@ -66 +66 @@
         code,bed = pa.searchAndReserveBed(s_id,"%s_%s" % (info['sex'],ds.get('student_status')))
         if code < 0:
-            return context.accommodation_pin_form(rendered = res,
+            return context.accommodation_pin__edit_form(rendered = res,
                                  psm = bed,
                                  mode = mode,