fix ajax_playground

Author: lenadax

examples/cone.example/src/cone/example/ajax/browser.py

@@ -1,18 +1,16 @@
 from cone.app.browser.ajax import ajax_continue
 from cone.app.browser.ajax import ajax_message
-from cone.app.browser.ajax import ajax_status_message
 from cone.app.browser.ajax import AjaxAction
 from cone.app.browser.ajax import AjaxEvent
 from cone.app.browser.ajax import AjaxMessage
-from cone.app.browser.ajax import AjaxOverlay
 from cone.app.browser.ajax import AjaxPath
 from cone.app.browser.layout import ProtectedContentTile
 from cone.app.browser.utils import make_url
-from cone.app.model import AppNode
 from cone.app.model import BaseNode
 from cone.app.model import Metadata
-from cone.app.model import Properties
 from cone.app.model import node_info
+from cone.app.model import Properties
+from cone.app.utils import node_path
 from cone.example.model import _
 from cone.tile import tile
 from node.utils import instance_property
@@ -87,12 +85,13 @@ def render(self):
       interface=AjaxPlayground,
       permission='view')
 class AjaxPathDemo(ProtectedContentTile):
+    # XXX: make this demo more obvious, e.g. by changing some content
 
     def render(self):
         url = make_url(self.request, node=self.model)
         ajax_continue(self.request, [
             AjaxPath(
-                path='/'.join(self.model.path),
+                path='/'.join(node_path(self.model)),
                 target=url,
                 event='contextchanged:#layout'
             )
@@ -105,6 +104,7 @@ def render(self):
       interface=AjaxPlayground,
       permission='view')
 class AjaxEventDemo(ProtectedContentTile):
+    # XXX: make this demo more obvious, e.g. by changing some content
 
     def render(self):
         url = make_url(self.request, node=self.model)
@@ -148,12 +148,14 @@ def render(self):
       interface=AjaxPlayground,
       permission='view')
 class AjaxCombinedDemo(ProtectedContentTile):
+    # XXX: this makes little sense, as the AjaxAction will be overridden
+    #      by the AjaxEvent. Find a better combination demo.
 
     def render(self):
         url = make_url(self.request, node=self.model)
         ajax_continue(self.request, [
             AjaxAction(url, 'ajax_demo_content', 'inner', '#ajax-demo-target'),
-            AjaxMessage('Combined: action + message + event!', 'success'),
+            AjaxMessage('Combined: action + message + event!', 'success', None),
             AjaxEvent(url, 'contextchanged', '#layout'),
         ])
         return ''

examples/cone.example/src/cone/example/ajax/templates/ajax_playground.pt

@@ -1,5 +1,6 @@
 <tal:view xmlns:tal="http://xml.zope.org/namespaces/tal"
-           omit-tag="True">
+          xmlns:ajax="http://namespaces.conestack.org/ajax"
+          omit-tag="True">
 
   <tal:contextmenu replace="structure tile('contextmenu')" />
 
@@ -31,8 +32,9 @@
               </p>
               <a href="#"
                  class="btn btn-outline-primary btn-sm ajax"
-                 tal:attributes="ajax:target view.ajax_path_url;
-                                 ajax:action 'ajax_path_demo:NONE:NONE'">
+                 ajax:bind="click"
+                 ajax:target="${context.ajax_path_url}"
+                 ajax:action="ajax_path_demo:NONE:NONE">
                 Trigger AjaxPath
               </a>
             </div>
@@ -51,8 +53,9 @@
               </p>
               <a href="#"
                  class="btn btn-outline-primary btn-sm ajax"
-                 tal:attributes="ajax:target view.ajax_action_url;
-                                 ajax:action 'ajax_action_demo:NONE:NONE'">
+                 ajax:bind="click"
+                 ajax:target="${context.ajax_action_url}"
+                 ajax:action="ajax_action_demo:NONE:NONE">
                 Trigger AjaxAction
               </a>
             </div>
@@ -72,8 +75,9 @@
               </p>
               <a href="#"
                  class="btn btn-outline-primary btn-sm ajax"
-                 tal:attributes="ajax:target view.ajax_action_url;
-                                 ajax:action 'ajax_event_demo:NONE:NONE'">
+                 ajax:bind="click"
+                 ajax:target="${context.ajax_action_url}"
+                 ajax:action="ajax_event_demo:NONE:NONE">
                 Trigger AjaxEvent
               </a>
             </div>
@@ -93,8 +97,9 @@
               </p>
               <a href="#"
                  class="btn btn-outline-primary btn-sm ajax"
-                 tal:attributes="ajax:target view.ajax_action_url;
-                                 ajax:action 'ajax_message_demo:NONE:NONE'">
+                 ajax:bind="click"
+                 ajax:target="${context.ajax_action_url}"
+                 ajax:action="ajax_message_demo:NONE:NONE">
                 Trigger AjaxMessage
               </a>
             </div>
@@ -114,8 +119,9 @@
               </p>
               <a href="#"
                  class="btn btn-outline-success btn-sm ajax"
-                 tal:attributes="ajax:target view.ajax_action_url;
-                                 ajax:action 'ajax_combined_demo:NONE:NONE'">
+                 ajax:bind="click"
+                 ajax:target="${context.ajax_action_url}"
+                 ajax:action="ajax_combined_demo:NONE:NONE">
                 Trigger Combined
               </a>
             </div>

examples/cone.example/src/cone/example/project/browser.py

@@ -203,7 +203,7 @@ class ProjectAddForm(ProjectForm):
     def save(self, widget, data):
         from cone.app.browser.utils import choose_name
         add_creation_metadata(self.request, self.model.attrs)
-        super().save(widget, data)
+        super(ProjectAddForm, self).save(widget, data)
         parent = self.model.parent
         parent[choose_name(parent, self.model.metadata.title)] = self.model
 
@@ -213,7 +213,7 @@ class ProjectEditForm(ProjectForm):
 
     def save(self, widget, data):
         update_creation_metadata(self.request, self.model.attrs)
-        super().save(widget, data)
+        super(ProjectEditForm, self).save(widget, data)
 
 
 # For Task add form, we need to create a TaskData and wrap in Task