Index: /main/waeup.kofa/trunk/src/waeup/kofa/documents/batching.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/documents/batching.py	(revision 13137)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/documents/batching.py	(revision 13138)
@@ -34,5 +34,5 @@
 from waeup.kofa.interfaces import (
     IBatchProcessor, FatalCSVError, IObjectConverter, IUserAccount,
-    IObjectHistory, IGNORE_MARKER)
+    IGNORE_MARKER)
 from waeup.kofa.interfaces import IKofaUtils
 from waeup.kofa.interfaces import MessageFactory as _
Index: /main/waeup.kofa/trunk/src/waeup/kofa/documents/browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/documents/browser.py	(revision 13137)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/documents/browser.py	(revision 13138)
@@ -36,5 +36,5 @@
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.interfaces import (
-    IContactForm, IObjectHistory, IKofaObject, IKofaUtils)
+    IContactForm, IKofaObject, IKofaUtils)
 from waeup.kofa.browser.layout import (
     KofaPage, KofaEditFormPage, KofaAddFormPage, KofaDisplayFormPage,
@@ -279,9 +279,9 @@
     @action(_('Add local role'), validator=NullValidator)
     def addLocalRole(self, **data):
-        return add_local_role(self,2,**data)
+        return add_local_role(self,3,**data)
 
     @action(_('Remove selected local roles'))
     def delLocalRoles(self, **data):
-        return del_local_roles(self,2,**data)
+        return del_local_roles(self,3,**data)
 
 
@@ -300,4 +300,18 @@
         return
 
+    # Actions must be repeated. They are not inherited from the parent class.
+
+    @action(_('Cancel'), validator=NullValidator)
+    def cancel(self, **data):
+        self.redirect(self.url(self.context))
+        return
+
+    @action(_('Add local role'), validator=NullValidator)
+    def addLocalRole(self, **data):
+        return add_local_role(self,3,**data)
+
+    @action(_('Remove selected local roles'))
+    def delLocalRoles(self, **data):
+        return del_local_roles(self,3,**data)
 
 class RESTDocumentManageFormPage(DocumentManageFormPage):
@@ -315,4 +329,18 @@
         return
 
+    # Actions must be repeated. They are not inherited from the parent class.
+
+    @action(_('Cancel'), validator=NullValidator)
+    def cancel(self, **data):
+        self.redirect(self.url(self.context))
+        return
+
+    @action(_('Add local role'), validator=NullValidator)
+    def addLocalRole(self, **data):
+        return add_local_role(self,3,**data)
+
+    @action(_('Remove selected local roles'))
+    def delLocalRoles(self, **data):
+        return del_local_roles(self,3,**data)
 
 class DocumentTriggerTransitionFormPage(KofaEditFormPage):
Index: /main/waeup.kofa/trunk/src/waeup/kofa/documents/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/documents/tests/test_browser.py	(revision 13137)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/documents/tests/test_browser.py	(revision 13138)
@@ -233,5 +233,8 @@
         self.assertTrue('HTML Document added.' in self.browser.contents)
         document = self.app['documents']['DOC2']
-
+        # All form action buttons are there
+        self.assertTrue('value="Add local role"' in self.browser.contents)
+        self.assertTrue('value="Save"' in self.browser.contents)
+        self.assertTrue('value="Cancel"' in self.browser.contents)
         # Document can be edited
         self.browser.getControl(name="form.title").value = 'My second doc'
