[Zapp-cvs-commit] ZApp ZApp_CMFBase.py,1.9,1.10

[<ssp...@us...>]

Update of /cvsroot/zapp/ZApp
In directory sc8-pr-cvs1:/tmp/cvs-serv29458

Modified Files:
	ZApp_CMFBase.py 
Log Message:
save cmf changes.. 

Index: ZApp_CMFBase.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ZApp_CMFBase.py	25 Jun 2003 16:31:18 -0000	1.9
--- ZApp_CMFBase.py	26 Jun 2003 15:18:52 -0000	1.10
***************
*** 63,69 ****
  def addZAppCMFObject(self, id, title='', klass=ZApp_CMFBase, useExisting=1):
  
-     #import pdb
-     #pdb.set_trace()
- 
      #
      # since we're a FreeRangeDataSkin.. we can get our data manager here..
--- 63,66 ----
***************
*** 96,99 ****
--- 93,99 ----
      initCMFObjectMetadata(o)
      o.change()
+ 
+     if klass != ZApp_CMFBase:
+         return o
      
  from DateTime import DateTime
***************
*** 112,118 ****
  
  factory_type_information = (
!     {'id': 'ZAppCMFContent',
!      'title':'ZApp CMF Content Type',
!      'meta_type' : 'ZApp CMF Content Type',
       'product': 'ZApp',
       'description':'Content type based on ZApp objects',
--- 112,162 ----
  
  factory_type_information = (
!     {'id': 'ZApp CMF Image',
!      'title':'',
!      'meta_type' : 'ZApp CMF Image',
!      'product': 'ZApp',
!      'description':'Image Content type based on ZApp objects',
!      'icon':'image_icon.gif',
!      'factory': 'addZAppCMFObject',
!      'immediate_view': 'zapp_image_edit_form',
!      'actions': ({'id': 'view',
!                   'name': 'View',
!                   'action': 'zapp_image_view',
!                   'permissions': (CMFCorePermissions.View,)},
!                  {'id': 'edit',
!                   'name': 'Edit',
!                   'action': 'zapp_image_edit_form',
!                   'permissions': (CMFCorePermissions.ModifyPortalContent,)},
!                  { 'id'            : 'metadata'
!                    , 'name'          : 'Metadata'
!                    , 'action': 'string:${object_url}/metadata_edit_form'
!                    , 'permissions'   : (CMFCorePermissions.ModifyPortalContent,)},
!                  ),
!      },
!     {'id': 'ZApp CMF File',
!      'title':'',
!      'meta_type' : 'ZApp CMF File',
!      'product': 'ZApp',
!      'description':'File Content type based on ZApp objects',
!      'icon':'file_icon.gif',
!      'factory': 'addZAppCMFObject',
!      'immediate_view': 'zapp_file_edit_form',
!      'actions': ({'id': 'view',
!                   'name': 'View',
!                   'action': 'zapp_file_view',
!                   'permissions': (CMFCorePermissions.View,)},
!                  {'id': 'edit',
!                   'name': 'Edit',
!                   'action': 'zapp_file_edit_form',
!                   'permissions': (CMFCorePermissions.ModifyPortalContent,)},
!                  { 'id'            : 'metadata'
!                    , 'name'          : 'Metadata'
!                    , 'action': 'string:${object_url}/metadata_edit_form'
!                    , 'permissions'   : (CMFCorePermissions.ModifyPortalContent,)},
!                  ),
!      },
!     {'id': 'ZApp CMF Content',
!      'title':'',
!      'meta_type' : 'ZApp CMF Content',
       'product': 'ZApp',
       'description':'Content type based on ZApp objects',
***************
*** 126,141 ****
                   {'id': 'edit',
                    'name': 'Edit',
-                   'action': 'zapp_cmf_object_view',
-                   'permissions': (CMFCorePermissions.View,)},
-                  {'id': 'editType',
-                   'name': 'EditType',
                    'action': 'zapp_cmf_object_edit_form',
!                   'permissions': (CMFCorePermissions.ManagerPortalContent,)},
!                  )
                   {'id': 'editType',
                    'name': 'EditType',
                    'action': 'zapp_cmf_object_type_edit_form',
!                   'permissions': (CMFCorePermissions.ManagerPortal,)},
!                  )
       },
      )
--- 170,184 ----
                   {'id': 'edit',
                    'name': 'Edit',
                    'action': 'zapp_cmf_object_edit_form',
!                   'permissions': (CMFCorePermissions.ModifyPortalContent,)},
                   {'id': 'editType',
                    'name': 'EditType',
                    'action': 'zapp_cmf_object_type_edit_form',
!                   'permissions': (CMFCorePermissions.ManagePortal,)},
!                  { 'id'            : 'metadata'
!                    , 'name'          : 'Metadata'
!                    , 'action': 'string:${object_url}/metadata_edit_form'
!                    , 'permissions'   : (CMFCorePermissions.ModifyPortalContent,)},
!                  ),
       },
      )