Index: /waeup/branches/ulif-rewrite/src/waeup/university/facultycontainer.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/university/facultycontainer.py	(revision 3909)
+++ /waeup/branches/ulif-rewrite/src/waeup/university/facultycontainer.py	(revision 3910)
@@ -5,5 +5,5 @@
 from waeup.basecontainer import BaseContainer
 from waeup.interfaces import IFacultyContainer
-from waeup.viewlets import MainArea, LeftSidebar, Index, Add
+from waeup.viewlets import MainArea, LeftSidebar, Index, Add, FormWrapMixin
 from interfaces import IFaculty
 from faculty import Faculty
@@ -69,5 +69,6 @@
         self.redirect(self.url(self.context))
 
-class AddFaculty(grok.Viewlet):
+        
+class AddFaculty(FormWrapMixin, grok.Viewlet):
     """A viewlet that wraps the `AddFacultyForm`.
     """
@@ -76,25 +77,9 @@
     grok.view(Add)
     grok.require('waeup.manageUniversity')
-    
-    def update(self, **data):
-        self.form = getMultiAdapter((self.context, self.request),
-                                    name='addfacultyform')
-        result = self.form.update_form()
-        if self.request.method == 'POST':
-            #app = get_application(self.context)
-            #self.__parent__.redirect(self.__parent__.url(obj=app))
-            pass
-        return
 
-    def render(self):
-        result = self.form.render()
-        try:
-            # strip all except the form part...
-            result = re.match('^.+\(<form[^\>]+>.*</form>).+$', result,
-                              re.DOTALL).groups()[0]
-        except:
-            # except there is no such part...
-            pass
-        return result
+    formview_name = 'addfacultyform' # The name of the formview we
+                                     # want to be rendered in this
+                                     # viewlet.
+
 
 class AddFacultyLink(grok.Viewlet):
