[zopeorg-checkins] CVS: Products/ZopeOrg-NV - CaseStudy.py:1.3 ZopeOrgTypes.py:1.5 __init__.py:1.21

[Sidnei da Silva]

Update of /cvs-zopeorg/Products/ZopeOrg-NV
In directory cvs.zope.org:/tmp/cvs-serv11879

Modified Files:
	CaseStudy.py ZopeOrgTypes.py __init__.py 
Log Message:
now the migration is running smoothly

=== Products/ZopeOrg-NV/CaseStudy.py 1.2 => 1.3 ===
         return self._getCookedText('_problem')
 
     security.declareProtected(ModifyPortalContent, 'setProblem')
-    def setProblem(self, text_format, problem, file, safety_belt):
+    def setProblem(self, text_format='structured-text', \
+                   problem='', file='', safety_belt=''):
         self._editText(text_format, problem, file, safety_belt, '_problem')
 
     security.declareProtected(View, 'editableSolution')
@@ -113,7 +114,8 @@
         return self._getCookedText('_solution')
 
     security.declareProtected(ModifyPortalContent, 'setSolution')
-    def setSolution(self, text_format, solution, file, safety_belt):
+    def setSolution(self, text_format='structured-text', \
+                    solution='', file='', safety_belt=''):
         self._editText(text_format, solution, file, safety_belt, '_solution')
 
     def _getCookedText(self, property, stx_level=None, set_level=0):


=== Products/ZopeOrg-NV/ZopeOrgTypes.py 1.4 => 1.5 ===
 #
 
 from Products.CMFCore import CMFCorePermissions
+import CaseStudy
+import ZopeServiceProvider
 
 ftis = (
 
@@ -56,34 +58,11 @@
   }
   ,
 )
-,
-( { 'id' : 'Member Folder'
-  , 'meta_type' : 'Skinned Folder'
-  , 'description' : """ Specialized Skinned Folder for Member homes"""
-  , 'icon' : 'folder_icon.gif'
-  , 'product' : ''
-  , 'factory' : ''
-  , 'filter_content_types' : 0
-  , 'immediate_view' : ''
-  , 'actions' : ( { 'name' : 'View'
-                  , 'action' : 'memberfolder_view'
-                  , 'permissions' : (CMFCorePermissions.View,)
-                  , 'category' : 'folder'
-                  }
-                , { 'name' : 'Edit'
-                  , 'action' : 'folder_edit_form'
-                  , 'permissions' : (CMFCorePermissions.ManageProperties,)
-                  , 'category' : 'folder'
-                  }
-                , { 'name' : 'Syndication'
-                  , 'action' : 'synPropertiesForm'
-                  , 'permissions' : (CMFCorePermissions.ManageProperties,)
-                  , 'category' : 'folder'
-                  }
-                )
-  }
-  ,
-)
 )
+
+ftis = list(ftis)
+ftis.append(CaseStudy.factory_type_information)
+ftis.append(ZopeServiceProvider.factory_type_information)
+ftis = tuple(ftis)
 
 


=== Products/ZopeOrg-NV/__init__.py 1.20 => 1.21 ===
 import Acquisition
 import CaseStudy
 import ZopeServiceProvider
+import ZopeOrgTypes
 import ZPublisher.Publish
 from string import rfind
 #import SoftwareProduct