[CMF-checkins] CVS: CMF/CMFSetup/xml - apcExport.xml:1.1.2.1 ticTypeExport.xml:1.1.2.1

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFSetup/xml
In directory cvs.zope.org:/tmp/cvs-serv18141/CMFSetup/xml

Modified Files:
      Tag: yuppie-actions-cleanup-branch
	apcExport.xml ticTypeExport.xml 
Log Message:
- updated action element


=== CMF/CMFSetup/xml/apcExport.xml 1.1 => 1.1.2.1 ===
--- CMF/CMFSetup/xml/apcExport.xml:1.1	Mon May 24 18:43:53 2004
+++ CMF/CMFSetup/xml/apcExport.xml	Sun Jul 18 18:08:45 2004
@@ -5,20 +5,21 @@
                   tal:attributes="id info/id;" >
   <action action_id="folder_contents"
           title="Folder Contents"
-          category="folder"
-          action_expr="${folder_url}/folder_contents"
           condition_expr=""
-          visible="1"
-          permission="View"
+          url_expr="string:${folder_url}/folder_contents"
+          category="folder"
+          visible="True"
           tal:repeat="action info/actions"
           tal:attributes="action_id action/id;
-                          title action/name;
-                          category action/category;
-                          action_expr action/action;
+                          title action/title;
                           condition_expr action/condition;
+                          url_expr action/action;
+                          category action/category;
                           visible action/visible;
-                          permission action/permission;
-                         " />
+                         ">
+   <permission
+      tal:repeat="permission action/permissions"
+      tal:content="permission">View</permission>
+  </action>
  </action-provider></tal:loop>
 </actions-tool>
-


=== CMF/CMFSetup/xml/ticTypeExport.xml 1.1 => 1.1.2.1 ===
--- CMF/CMFSetup/xml/ticTypeExport.xml:1.1	Sat May 29 19:44:55 2004
+++ CMF/CMFSetup/xml/ticTypeExport.xml	Sun Jul 18 18:08:45 2004
@@ -38,20 +38,20 @@
   <action
      action_id="view"
      title="View"
-     condition=""
-     action_expr="string:${object_url}/foo_view"
-     permissions="View"
+     condition_expr=""
+     url_expr="string:${object_url}/foo_view"
      category="object"
      visible="True"
      tal:repeat="action info/actions"
      tal:attributes="action_id action/id;
                      title action/title;
-                     condition action/condition;
-                     action_expr action/action;
-                     permissions python:
-                       ','.join( action[ 'permissions' ] );
+                     condition_expr action/condition;
+                     url_expr action/action;
                      category action/category;
                      visible action/visible;
-                    "
-     />
+                    ">
+   <permission
+      tal:repeat="permission action/permissions"
+      tal:content="permission">View</permission>
+  </action>
 </type-info>