Changeset 816

Timestamp:

9 Nov 2006, 17:33:49 (18 years ago)

Author:

joachim

Message:

pin is now not used if jamb_no is invalid
reserve_accommodation had permission set to false instead of View
students_index got an error, when called from student in enter_clearance_pin

Location:

WAeUP_SRP/trunk

Files:

• Widgets.py (modified) (4 diffs)
• profiles/default/actions.xml (modified) (2 diffs)
• skins/waeup_student/students_index.py (modified) (1 diff)

WAeUP_SRP/trunk/Widgets.py

@@ -292 +292 @@
 
         valid = CPSStringWidget.validate(self, datastructure, **kw)
+        #import pdb;pdb.set_trace()
         if not valid:
             return 0
@@ -312 +313 @@
                 datamodel = datastructure.getDataModel()
                 datamodel[self.fields[0]] = value
-
             return not err
 
@@ -455 +455 @@
     def validate(self, datastructure, **kw):
         """Validate datastructure and update datamodel."""
-        #import pdb;pdb.set_trace()
+        import pdb;pdb.set_trace()
         widget_id = self.getWidgetId()
         v = datastructure[widget_id]
@@ -466 +466 @@
         pins = self.portal_pins
         pin = "%(prefix)s%(b)s%(n)s" % vars()
+        do = 1
         if self.reference == "":
             ref = str(self.portal_membership.getAuthenticatedMember())
         else:
             ref = datastructure[self.reference]
-        ok = pins.searchAndSetRecord(pin,ref,prefix)
-        while 1:
+            if datastructure.errors.get(self.reference) is not None:
+                do = 0
+                err = 'Invalid JAMB Number, PIN not used'
+        while do:
+            ok = pins.searchAndSetRecord(pin,ref,prefix)
             if ok == -2:
                 err = 'You have already applied with a different PIN, please login.'

WAeUP_SRP/trunk/profiles/default/actions.xml

@@ -154 +154 @@
      url_expr="string:${portal_url}/reserve_accommodation"
      visible="True">
-   <permission>False</permission>
+   <permission>View</permission>
   </action>
   <action title="Register Courses" action_id="register_courses"
@@ -160 +160 @@
      url_expr="string:${portal_url}/register_courses"
      visible="True">
-   <permission>False</permission>
+   <permission>View</permission>
   </action>
   <action title="Home" action_id="students_home" category="student_navigation"

WAeUP_SRP/trunk/skins/waeup_student/students_index.py

@@ -20 +20 @@
     return redirect("%s/srp_anonymous_view" % context.portal_url())
 
-campus = context.portal_catalog(meta_type = "University")[-1].getObject()
+campus_url = "%s/campus" % (context.portal_url.getPortalPath())
+#campus = context.portal_catalog(meta_type = "University")[-1].getObject()
 
 if context.isManager():
-    return redirect("%s/searchStudents" % campus.students.absolute_url())
+    return redirect("%s/searchStudents" % campus_url)
 if context.isStudent():
     info = context.getStudentInfo()