Index: /main/waeup.sirp/trunk/src/waeup/sirp/jambtables/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/jambtables/browser.py	(revision 5483)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/jambtables/browser.py	(revision 5484)
@@ -32,5 +32,5 @@
 from waeup.sirp.jambtables.util import get_applicant_data
 from waeup.sirp.jambtables.interfaces import (
-    IApplicant, IApplicantContainer, IApplicantPrincipal)
+    IApplicant, IApplicantContainer, IApplicantPrincipal, IApplicantPDEEditData)
                                               
 
@@ -107,7 +107,10 @@
     grok.context(IApplicant)
     grok.name('edit')
-    form_fields = grok.AutoFields(IApplicant)
-    form_fields['fst_sit_results'].custom_widget = list_results_widget
-    label = 'Edit Application'
+    form_fields = grok.AutoFields(IApplicantPDEEditData)
+
+    @property
+    def label(self):
+        # XXX: Use current/upcoming session
+        return 'Apply for Post UDE Screening Test (2009/2010)'
     title = 'Edit Application'
     pnav = 1
@@ -119,13 +122,9 @@
         return
 
-    @grok.action('Save and return')
-    def saveAndReturn(self, **data):
+    @grok.action('Final Submit')
+    def finalsubmit(self, **data):
         self.applyData(self.context, **data)
-        self.redirect(self.url(self.context))
-        return
-
-    @grok.action('Cancel', validator=NullValidator)
-    def cancel(self, **data):
-        self.redirect(self.url(self.context))
+        self.context._p_changed = True
+        # XXX: Lock the form for editing...
         return
 
