[Checkins] SVN: z3ext.layoutform/trunk/ removed cancel button from edit form

[Nikolay Kim]

Log message for revision 88660:
  removed cancel button from edit form

Changed:
  U   z3ext.layoutform/trunk/CHANGES.txt
  U   z3ext.layoutform/trunk/setup.py
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/edit.py
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/interfaces.py

-=-
Modified: z3ext.layoutform/trunk/CHANGES.txt
===================================================================
--- z3ext.layoutform/trunk/CHANGES.txt	2008-07-21 20:14:17 UTC (rev 88659)
+++ z3ext.layoutform/trunk/CHANGES.txt	2008-07-21 20:48:28 UTC (rev 88660)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.1.0 (2008-07-22)
+------------------
+
+- Remove cancel button from edit form
+
+
 1.0.1 (2008-06-02)
 ------------------
 

Modified: z3ext.layoutform/trunk/setup.py
===================================================================
--- z3ext.layoutform/trunk/setup.py	2008-07-21 20:14:17 UTC (rev 88659)
+++ z3ext.layoutform/trunk/setup.py	2008-07-21 20:48:28 UTC (rev 88660)
@@ -21,7 +21,7 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-version='1.0.3dev'
+version='1.1.0'
 
 
 setup(name='z3ext.layoutform',

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/edit.py
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/edit.py	2008-07-21 20:14:17 UTC (rev 88659)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/edit.py	2008-07-21 20:48:28 UTC (rev 88660)
@@ -26,20 +26,17 @@
 from z3ext.layout.pagelet import BrowserPagelet
 from z3ext.statusmessage.interfaces import IStatusMessage
 
-import interfaces
-from interfaces import _
+from interfaces import _, IPageletEditForm, ISaveButton
 
 
 class PageletEditForm(form.EditForm, BrowserPagelet):
-    interface.implements(interfaces.IPageletEditForm)
+    interface.implements(IPageletEditForm)
 
     render = BrowserPagelet.render
     __call__ = BrowserPagelet.__call__
 
-    formCancelMessage = _(u'Edit action has been canceled.')
-
-    @button.buttonAndHandler(_(u'Save'), name='save',
-                             provides=interfaces.ISaveButton)
+    @button.buttonAndHandler(
+        _(u'Save'), name='save', provides=ISaveButton)
     def handleApply(self, action):
         data, errors = self.extractData()
         if errors:
@@ -55,15 +52,5 @@
             if nextURL:
                 self.redirect(nextURL)
 
-    @button.buttonAndHandler(_(u'Cancel'), name='cancel',
-                             provides=interfaces.ICancelButton)
-    def handleCancel(self, action):
-        self.redirect(self.cancelURL())
-        IStatusMessage(self.request).add(self.formCancelMessage)
-
     def nextURL(self):
         return ''
-
-    def cancelURL(self):
-        return '%s/@@SelectedManagementView.html'%\
-            absoluteURL(self.context, self.request)

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/interfaces.py
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/interfaces.py	2008-07-21 20:14:17 UTC (rev 88659)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/interfaces.py	2008-07-21 20:48:28 UTC (rev 88660)
@@ -53,15 +53,10 @@
 class IPageletEditForm(IPageletForm):
     """Edit form mixin for pagelet implementation."""
 
-    formCancelMessage = interface.Attribute('Form cancel message')
-
     def nextURL():
         """ as next url use newly created content url """
 
-    def cancelURL():
-        """ cancel url """
 
-
 class IAddButton(interface.Interface):
     """ add button """