zapp-cvs-commit Mailing List for ZApp Framework (Page 2)
Brought to you by:
sspickle
Menu
▾
▴
zapp-cvs-commit — Mailing List for CVS commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(24) |
Jul
(14) |
Aug
(19) |
Sep
(3) |
Oct
(21) |
Nov
(9) |
Dec
(8) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(23) |
Feb
(13) |
Mar
(37) |
Apr
(5) |
May
(15) |
Jun
(2) |
Jul
(1) |
Aug
(1) |
Sep
(13) |
Oct
(1) |
Nov
(1) |
Dec
|
| 2005 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Steve S. <ssp...@us...> - 2004-09-16 11:27:17
|
Update of /cvsroot/zapp/ZApp/tests/ZAppTestClasses In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3151/tests/ZAppTestClasses Modified Files: ZTC_RObject.py Log Message: catch MySQL/gadfly/ZODB levers back up to PG levers. Index: ZTC_RObject.py =================================================================== RCS file: /cvsroot/zapp/ZApp/tests/ZAppTestClasses/ZTC_RObject.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ZTC_RObject.py 24 Nov 2003 22:15:17 -0000 1.4 --- ZTC_RObject.py 16 Sep 2004 11:27:07 -0000 1.5 *************** *** 12,18 **** lprop(id='name'), lprop(id='objsize',type='int'), - lprop(id='aTimeStamp', prop_type='date', - prop_default='1/1/1001', dbType='timestamp', create_template='%(id)s=now()', update_template='%(id)s=now()', - mode='', update_internal=1), ] ) --- 12,15 ---- |
|
From: Steve S. <ssp...@us...> - 2004-09-15 13:32:42
|
Update of /cvsroot/zapp/ZApp/leverMethods/ZODB In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3500/leverMethods/ZODB Modified Files: newKeyLever.plain selectItemLever.plain skinScriptLever.plain Log Message: fixed lever signatures.. Index: selectItemLever.plain =================================================================== RCS file: /cvsroot/zapp/ZApp/leverMethods/ZODB/selectItemLever.plain,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** selectItemLever.plain 2 Jun 2003 16:41:37 -0000 1.6 --- selectItemLever.plain 15 Sep 2004 13:32:32 -0000 1.7 *************** *** 6,10 **** Id: selectItemLever Meta-Type: Script (Python) ! Parameters: sqlName='selectItem', dbName='', catalogName='' Permissions: Proxy-Roles: --- 6,10 ---- Id: selectItemLever Meta-Type: Script (Python) ! Parameters: sqlName='selectItem', dbName='', catalogName='', rackName='defaultRack' Permissions: Proxy-Roles: Index: skinScriptLever.plain =================================================================== RCS file: /cvsroot/zapp/ZApp/leverMethods/ZODB/skinScriptLever.plain,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** skinScriptLever.plain 2 Jun 2003 16:41:37 -0000 1.5 --- skinScriptLever.plain 15 Sep 2004 13:32:32 -0000 1.6 *************** *** 6,10 **** Id: skinScriptLever Meta-Type: Script (Python) ! Parameters: dbName='', rackName='defaultRack', catalogName='' Permissions: Proxy-Roles: --- 6,10 ---- Id: skinScriptLever Meta-Type: Script (Python) ! Parameters: dbName='', rackName='defaultRack', catalogName='', rackName='defaultRack' Permissions: Proxy-Roles: Index: newKeyLever.plain =================================================================== RCS file: /cvsroot/zapp/ZApp/leverMethods/ZODB/newKeyLever.plain,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** newKeyLever.plain 28 Mar 2003 06:28:13 -0000 1.3 --- newKeyLever.plain 15 Sep 2004 13:32:32 -0000 1.4 *************** *** 6,10 **** Id: newKeyLever Meta-Type: Script (Python) ! Parameters: sqlName='getNewKey', dbName='', catalogName='ZApp_Catalog' Permissions: Proxy-Roles: --- 6,10 ---- Id: newKeyLever Meta-Type: Script (Python) ! Parameters: sqlName='getNewKey', dbName='', catalogName='ZApp_Catalog', rackName='defaultRack' Permissions: Proxy-Roles: |
|
From: Steve S. <ssp...@us...> - 2004-09-09 19:22:20
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18808 Modified Files: ZApp_CMFBase.py Log Message: fixed data attribute error Index: ZApp_CMFBase.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** ZApp_CMFBase.py 15 Aug 2004 18:08:17 -0000 1.55 --- ZApp_CMFBase.py 9 Sep 2004 19:22:09 -0000 1.56 *************** *** 816,823 **** Image.edit(self, precondition, file) index_html = Image.index_html __str__ = Image.__str__ __len__ = Image.__len__ ! get_size = Image.get_size getContentType = Image.getContentType manage_FTPget = Image.index_html --- 816,830 ---- Image.edit(self, precondition, file) + def get_size(self): + try: + size = Image.get_size(self) + except AttributeError: + size = 0 + return size + index_html = Image.index_html __str__ = Image.__str__ __len__ = Image.__len__ ! getContentType = Image.getContentType manage_FTPget = Image.index_html |
|
From: Steve S. <ssp...@us...> - 2004-08-15 18:08:27
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29601 Modified Files: ZApp_Base.py ZApp_CMFBase.py Log Message: careful deleting folderish things. Index: ZApp_Base.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_Base.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ZApp_Base.py 1 Apr 2004 14:13:54 -0000 1.24 --- ZApp_Base.py 15 Aug 2004 18:08:17 -0000 1.25 *************** *** 16,20 **** from OFS import SimpleItem from OFS.PropertyManager import PropertyManager ! from Products.ZPatterns.DataSkins import DataSkin, _v_dm_ from Products.ZPatterns.SkinScript.Components import Trigger, Compute from ZApp_LOG import ZApp_LOG --- 16,20 ---- from OFS import SimpleItem from OFS.PropertyManager import PropertyManager ! from Products.ZPatterns.DataSkins import DataSkin, _v_dm_, _v_status_ from Products.ZPatterns.SkinScript.Components import Trigger, Compute from ZApp_LOG import ZApp_LOG *************** *** 55,58 **** --- 55,68 ---- DataSkin.__get_attr__ = __new__get_attr__ + __orig__objectDeleting = DataSkin._objectDeleting + + def __new__objectDeleting(self, _v_status_=_v_status_, _v_dm_=_v_dm_): + + ZApp_LOG("In _objectDeleting -> %s, %ss" % (`id`, _v_status_)) + + return __orig__objectDeleting(self, _v_status_, _v_dm_) + + DataSkin._objectDeleting = __new__objectDeleting + if ZAPP_DEBUG is not undefined_zdb: Index: ZApp_CMFBase.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** ZApp_CMFBase.py 26 May 2004 15:19:26 -0000 1.54 --- ZApp_CMFBase.py 15 Aug 2004 18:08:17 -0000 1.55 *************** *** 353,358 **** Be sure to handle manage_beforeDelete. """ ! ZApp_LOG("ZAppCMF_Base_manage_beforeDelete", dbug_level) ! return SkinnedFolder.manage_beforeDelete(self, item, container) def manage_callPUTFilter(self): --- 353,360 ---- Be sure to handle manage_beforeDelete. """ ! ZApp_LOG("ZAppCMF_Base_manage_beforeDelete id->f%s" % self.getId(), dbug_level) ! result = SkinnedFolder.manage_beforeDelete(self, item, container) ! self._objectDeleting() ! return result def manage_callPUTFilter(self): |
|
From: Steve S. <ssp...@us...> - 2004-07-14 02:29:06
|
Update of /cvsroot/zapp/ZApp/leverMethods/PG In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16670/leverMethods/PG Modified Files: insertItemLever.plain updateItemLever.plain Log Message: fix lever problem with sized text fields that can have 'NULL' value as well Index: insertItemLever.plain =================================================================== RCS file: /cvsroot/zapp/ZApp/leverMethods/PG/insertItemLever.plain,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** insertItemLever.plain 21 Mar 2004 13:08:19 -0000 1.15 --- insertItemLever.plain 14 Jul 2004 02:28:57 -0000 1.16 *************** *** 53,57 **** if dbType in sizedTypes: theSize = item.get('dbSize',item.get('sqlSize',defaultSize)) ! theVal = ('"%s[0:%i]"' % (itemID, theSize)) else: theVal = itemID --- 53,57 ---- if dbType in sizedTypes: theSize = item.get('dbSize',item.get('sqlSize',defaultSize)) ! theVal = ('"%s and %s[0:%i]"' % (itemID, itemID, theSize)) else: theVal = itemID Index: updateItemLever.plain =================================================================== RCS file: /cvsroot/zapp/ZApp/leverMethods/PG/updateItemLever.plain,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** updateItemLever.plain 21 Mar 2004 13:08:19 -0000 1.11 --- updateItemLever.plain 14 Jul 2004 02:28:58 -0000 1.12 *************** *** 58,62 **** if dbType in sizedTypes: theSize = item.get('dbSize',item.get('sqlSize',defaultSize)) ! theVal = ('"%s[0:%i]"' % (itemID, theSize)) else: theVal = itemID --- 58,62 ---- if dbType in sizedTypes: theSize = item.get('dbSize',item.get('sqlSize',defaultSize)) ! theVal = ('"%s and %s[0:%i]"' % (itemID, itemID, theSize)) else: theVal = itemID |
|
From: Steve S. <ssp...@us...> - 2004-06-28 13:17:48
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6557 Modified Files: ZApp_Specialist.py Log Message: permit use of alternate query in getItemIds and getItems Index: ZApp_Specialist.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_Specialist.py,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** ZApp_Specialist.py 23 May 2004 21:42:09 -0000 1.41 --- ZApp_Specialist.py 28 Jun 2004 13:17:36 -0000 1.42 *************** *** 531,544 **** return itemList ! def ZApp_doSelectItem(self, REQUEST=None, displayQuery=None): """ call a 'selectItem' method bound to me.. check for the right signature/meta_type/something.. """ if displayQuery is not None: ! if self.selectItem.meta_type[:len('Script')] == 'Script': ! result = self.selectItem(conditions = REQUEST, src__=1) else: ! result = self.selectItem(REQUEST = REQUEST, src__=1) return result --- 531,548 ---- return itemList ! def ZApp_doSelectItem(self, REQUEST=None, queryId='', displayQuery=None): """ call a 'selectItem' method bound to me.. check for the right signature/meta_type/something.. """ + queryId = queryId or 'selectItem' + + query = getattr(self, queryId) + if displayQuery is not None: ! if query.meta_type[:len('Script')] == 'Script': ! result = query(conditions = REQUEST, src__=1) else: ! result = query(REQUEST = REQUEST, src__=1) return result *************** *** 551,555 **** return result ! def ZApp_querySearchDirect(self, conditions=None, displayQuery=0, **kw): """ Call the query interface directly.. (used often for getting statistical info..) """ --- 555,559 ---- return result ! def ZApp_querySearchDirect(self, conditions=None, queryId=None, displayQuery=0, **kw): """ Call the query interface directly.. (used often for getting statistical info..) """ *************** *** 564,568 **** if displayQuery: ! return self.ZApp_doSelectItem(REQUEST=conditions, src__=1) # --- 568,572 ---- if displayQuery: ! return self.ZApp_doSelectItem(REQUEST=conditions, queryId=queryId, src__=1) # *************** *** 575,579 **** conditions = theForm ! return self.ZApp_doSelectItem( REQUEST=conditions ) def _v_IDCache(self): --- 579,583 ---- conditions = theForm ! return self.ZApp_doSelectItem( REQUEST=conditions, queryId=queryId ) def _v_IDCache(self): *************** *** 628,632 **** return queryResult ! def ZApp_getItemIds(self, conditions=None, displayQuery=0, createIfNone=0, REQUEST=None, **kw): """ Get all my itemIds that match conditions.. """ --- 632,636 ---- return queryResult ! def ZApp_getItemIds(self, conditions=None, displayQuery=0, createIfNone=0, queryId=None, REQUEST=None, **kw): """ Get all my itemIds that match conditions.. """ *************** *** 652,658 **** if displayQuery: ! return self.ZApp_doSelectItem(REQUEST=conditions, displayQuery=displayQuery) ! results = self.ZApp_doSelectItem(REQUEST = conditions) ZApp_LOG( "ZApp_Specialist in %s.getItemIds(%s)" % (self.id, conditions) ) --- 656,662 ---- if displayQuery: ! return self.ZApp_doSelectItem(REQUEST=conditions, displayQuery=displayQuery, queryId=queryId) ! results = self.ZApp_doSelectItem(REQUEST = conditions, queryId=queryId) ZApp_LOG( "ZApp_Specialist in %s.getItemIds(%s)" % (self.id, conditions) ) |
|
From: Steve S. <ssp...@us...> - 2004-06-08 14:29:10
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12566 Modified Files: ZApp_Application.py Log Message: cache the portal object so we don't have to look it up all the time.. Index: ZApp_Application.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_Application.py,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ZApp_Application.py 30 Mar 2004 17:06:25 -0000 1.35 --- ZApp_Application.py 8 Jun 2004 14:29:01 -0000 1.36 *************** *** 152,162 **** zapp_app_id = ComputedAttribute( zapp_app_id ) def zapp_portal_object( self ): if hasattr(self, 'portal_url'): ! return self.portal_url.getPortalObject() for item in self.objectValues(): if hasattr(item, '_isPortalRoot'): ! return item zapp_portal_object = ComputedAttribute( zapp_portal_object ) --- 152,172 ---- zapp_app_id = ComputedAttribute( zapp_app_id ) + _v_portal_object = None + def zapp_portal_object( self ): + + if self._v_portal_object: + return self._v_portal_object + + ZApp_LOG("looking up portal object.. ", dbug_level) + if hasattr(self, 'portal_url'): ! v = self._v_portal_object = self.portal_url.getPortalObject() ! return v for item in self.objectValues(): if hasattr(item, '_isPortalRoot'): ! v = self._v_portal_object = item ! return v zapp_portal_object = ComputedAttribute( zapp_portal_object ) |
|
From: Steve S. <ssp...@us...> - 2004-05-26 15:19:36
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16701 Modified Files: ZApp_CMFBase.py Log Message: make fs_object access safer.. Index: ZApp_CMFBase.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** ZApp_CMFBase.py 26 May 2004 15:13:46 -0000 1.53 --- ZApp_CMFBase.py 26 May 2004 15:19:26 -0000 1.54 *************** *** 659,664 **** size = getattr(self, 'size', None) if size is None: ! if self.fs_object: ! size = self.fs_object.get_size() else: size = 0 --- 659,665 ---- size = getattr(self, 'size', None) if size is None: ! fs_object = getattr(self, 'fs_object', None) ! if fs_object: ! size = fs_object.get_size() else: size = 0 |
|
From: Steve S. <ssp...@us...> - 2004-05-26 15:14:01
|
Update of /cvsroot/zapp/ZApp/skins/zapp_generic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15366/skins/zapp_generic Modified Files: zapp_cmf_object_edit.py Log Message: added manage_beforeDelete.. and better factoring of path calculations.. Index: zapp_cmf_object_edit.py =================================================================== RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_object_edit.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** zapp_cmf_object_edit.py 25 Jan 2004 20:58:46 -0000 1.9 --- zapp_cmf_object_edit.py 26 May 2004 15:13:47 -0000 1.10 *************** *** 58,72 **** currVal = currVal[:-1] - if 0: - # I don't think anybody is using this anymore..... - for item in myTPropDefs: - propName = item.get('name') - propType = item.get('type') - if (propName in dict.keys()) and (propType == 'xml'): - inputValue = dict.get(propName,'') - if inputValue: - inputValue = xmlrpclib.loads(inputValue) - dict[propName] = inputValue[0][0] - metadata = dict.get('metadata',None) --- 58,61 ---- |
|
From: Steve S. <ssp...@us...> - 2004-05-26 15:14:01
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15366 Modified Files: ZApp_CMFBase.py ZApp_DocMPatch.py __init__.py Log Message: added manage_beforeDelete.. and better factoring of path calculations.. Index: ZApp_DocMPatch.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_DocMPatch.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ZApp_DocMPatch.py 4 Apr 2004 21:47:10 -0000 1.1 --- ZApp_DocMPatch.py 26 May 2004 15:13:46 -0000 1.2 *************** *** 5,10 **** from Products.CMFDefault.Document import Document - old_manage_FTPget = Document.manage_FTPget - def new_manage_FTPget(self): """ --- 5,8 ---- *************** *** 16,18 **** return result ! Document.manage_FTPget = new_manage_FTPget --- 14,18 ---- return result ! if Document.manage_FTPget is not new_manage_FTPget: ! old_manage_FTPget = Document.manage_FTPget ! Document.manage_FTPget = new_manage_FTPget Index: __init__.py =================================================================== RCS file: /cvsroot/zapp/ZApp/__init__.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** __init__.py 4 Apr 2004 21:47:10 -0000 1.27 --- __init__.py 26 May 2004 15:13:46 -0000 1.28 *************** *** 64,74 **** context.registerBaseClass(ZApp_CMFBase.ZApp_CMF_FSImage) context.registerBaseClass(ZApp_CMFBase.ZApp_CMF_ZODBImage) context.registerBaseClass(ZApp_CMFBase.ZApp_CMF_FSFolder) utils.ContentInit( 'ZApp CMF Content', ! content_types = (ZApp_CMFBase.ZApp_CMFBase, ZApp_CMFBase.ZApp_CMF_FSImage, ZApp_CMFBase.ZApp_CMF_ZODBImage, ZApp_CMFBase.ZApp_CMF_FSFolder,), permission = AddPortalContent, ! extra_constructors = (ZApp_CMFBase.addZAppCMFObject, ZApp_CMFBase.addZAppCMFFSImage, ZApp_CMFBase.addZAppCMFZODBImage, ZApp_CMFBase.addZAppCMFFSFolder), fti=ZApp_CMFBase.factory_type_information, ).initialize(context) --- 64,75 ---- context.registerBaseClass(ZApp_CMFBase.ZApp_CMF_FSImage) context.registerBaseClass(ZApp_CMFBase.ZApp_CMF_ZODBImage) + context.registerBaseClass(ZApp_CMFBase.ZApp_CMF_ZODBFile) context.registerBaseClass(ZApp_CMFBase.ZApp_CMF_FSFolder) utils.ContentInit( 'ZApp CMF Content', ! content_types = (ZApp_CMFBase.ZApp_CMFBase, ZApp_CMFBase.ZApp_CMF_FSImage, ZApp_CMFBase.ZApp_CMF_ZODBImage, ZApp_CMFBase.ZApp_CMF_ZODBFile, ZApp_CMFBase.ZApp_CMF_FSFolder), permission = AddPortalContent, ! extra_constructors = (ZApp_CMFBase.addZAppCMFObject, ZApp_CMFBase.addZAppCMFFSImage, ZApp_CMFBase.addZAppCMFZODBImage, ZApp_CMFBase.addZAppCMFZODBFile, ZApp_CMFBase.addZAppCMFFSFolder), fti=ZApp_CMFBase.factory_type_information, ).initialize(context) Index: ZApp_CMFBase.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** ZApp_CMFBase.py 26 May 2004 10:21:04 -0000 1.52 --- ZApp_CMFBase.py 26 May 2004 15:13:46 -0000 1.53 *************** *** 11,14 **** --- 11,15 ---- from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Products.CMFDefault.Image import Image + from Products.CMFDefault.File import File from ZApp_Base import ZApp_Base, extendProperties, LeverPropertyCollection, LeverProperty *************** *** 70,73 **** --- 71,80 ---- ) + _custom_skin_scripts = ("WITH SELF COMPUTE portal_object_id=_.getattr(self, 'zapp_portal_id')", + "WITH SELF COMPUTE portal_object=_.getattr(self.findApplication(), self.portal_object_id)", + "WITH SELF COMPUTE portal_rel_path=self.cmfdataid[1:].replace(',','/')", + "WITH SELF COMPUTE portal_instance=self.portal_object and self.portal_object.restrictedTraverse(self.portal_rel_path)", + ) + manage_options = SkinnedFolder.manage_options + ({ 'label' : 'Dublin Core' , 'action' : 'manage_metadata'},) *************** *** 342,345 **** --- 349,359 ---- self.ZAppRecursionLock_clear() + def manage_beforeDelete(self, item, container): + """ + Be sure to handle manage_beforeDelete. + """ + ZApp_LOG("ZAppCMF_Base_manage_beforeDelete", dbug_level) + return SkinnedFolder.manage_beforeDelete(self, item, container) + def manage_callPUTFilter(self): """ *************** *** 375,378 **** --- 389,398 ---- selfRItem.change(contextID=selfContextID) + def SearchableText(self): + """ + override SearchableText in sub-classes.. if there is one. + """ + return getattr(self, 'zapp_searchable_text','') or ( "%s %s" % (self.title, self.description)) + extendProperties(ZApp_CMFBase, props) *************** *** 421,427 **** __dav_collection__ = 0 ! _custom_skin_scripts = ("WITH SELF COMPUTE portal_object_id=_.getattr(self, 'zapp_portal_id')", ! "WITH SELF COMPUTE portal_object=_.getattr(self.findApplication(), self.portal_object_id)" ! "WITH SELF COMPUTE fs_object_relpath='%s/%s/%s' % (self.getPhysicalPath()[1], self.portal_object_id, self.cmfdataid[1:].replace(',','/'))", "WITH SELF COMPUTE fs_object_url=self.findApplication().absolute_url() + '/fSystem/' + self.fs_object_relpath", "WITH SELF COMPUTE fs_root_object=self.getFSRoot()", --- 441,445 ---- __dav_collection__ = 0 ! _custom_skin_scripts = ("WITH SELF COMPUTE fs_object_relpath='%s/%s/%s' % (self.getPhysicalPath()[1], self.portal_object_id, self.portal_rel_path)", "WITH SELF COMPUTE fs_object_url=self.findApplication().absolute_url() + '/fSystem/' + self.fs_object_relpath", "WITH SELF COMPUTE fs_root_object=self.getFSRoot()", *************** *** 444,448 **** ZApp_LOG("ZApp FS Object Manage after add", dbug_level) ZApp_CMFBase.manage_afterAdd(self, item, container) - #self.manage_callPUTFilter() def objectValues(self, spec=None): --- 462,465 ---- *************** *** 740,757 **** extendProperties(ZApp_CMF_FSImage, []) ! class ZApp_CMF_ZODBImage( ZApp_CMFBase, Image): - meta_type = 'ZApp CMF ZODB Image' zapp_cmf_type = 1 - data = '' isPrincipiaFolderish = 0 isAnObjectManager = 0 __dav_collection__ = 0 - __implements__ = ( - Image.__implements__, - ) - - class_default_for_copyable = 0 # make these guys default to 'not copyable' --- 757,767 ---- extendProperties(ZApp_CMF_FSImage, []) ! class ZApp_CMF_ZODBObj( ZApp_CMFBase ): zapp_cmf_type = 1 isPrincipiaFolderish = 0 isAnObjectManager = 0 __dav_collection__ = 0 class_default_for_copyable = 0 # make these guys default to 'not copyable' *************** *** 762,765 **** --- 772,790 ---- displayCustomUpdate_pt = PageTemplateFile('zpt/CMF_displayRelatedObjects', globals()) + def getData(self): + """ + return data object. + """ + return self.data + + class ZApp_CMF_ZODBImage( ZApp_CMF_ZODBObj, Image): + + meta_type = 'ZApp CMF ZODB Image' + + __implements__ = ( + Image.__implements__, + ) + + def manage_afterAdd(self, item, container): """ *************** *** 774,783 **** self.ZAppRecursionLock_clear() - def getData(self): - """ - return data object. - """ - return self.data - def PUT(self, REQUEST, RESPONSE): """ --- 799,802 ---- *************** *** 805,808 **** --- 824,875 ---- extendProperties(ZApp_CMF_ZODBImage, []) + class ZApp_CMF_ZODBFile( ZApp_CMF_ZODBObj, File): + + meta_type = 'ZApp CMF ZODB File' + data = '' + content_type = '' + + __implements__ = ( + File.__implements__, + ) + + displayCustomUpdate_pt = PageTemplateFile('zpt/CMF_displayRelatedObjects', globals()) + + def manage_afterAdd(self, item, container): + """ + Do manage_afterAdd + """ + ZApp_LOG("In ZODB File manage_afterAdd... ", dbug_level) + checkRecursion = self.ZAppBase_manage_afterAdd(item, container) + + if checkRecursion: + File.manage_afterAdd(self, item, container) + ZApp_Base.manage_afterAdd(self, item, container) + self.ZAppRecursionLock_clear() + + def PUT(self, REQUEST, RESPONSE): + """ + Handle a webdave PUT... + """ + ZApp_LOG("In ZODB PUT", dbug_level) + File.PUT(self, REQUEST, RESPONSE) + + def edit(self, precondition='', file=''): + """ + delegate to Image class.. but add hook... + """ + File.edit(self, precondition, file) + + index_html = File.index_html + __str__ = File.__str__ + __len__ = File.__len__ + get_size = File.get_size + getContentType = File.getContentType + manage_FTPget = File.index_html + manage_FTPstat = File.manage_FTPstat + manage_FTPlist = File.manage_FTPlist + + extendProperties(ZApp_CMF_ZODBFile, []) + from DateTime import DateTime *************** *** 875,878 **** --- 942,998 ---- 'permissions': (CMFCorePermissions.ModifyPortalContent,), }, + {'id': 'edit external', + 'name': 'Edit External', + 'action': 'zapp_cmf_object_edit_form', + 'permissions': (CMFCorePermissions.ModifyPortalContent,)}, + {'id': 'editXternalType', + 'name': 'Edit External Type', + 'action': 'zapp_cmf_object_type_edit_form', + 'permissions': (CMFCorePermissions.ManagePortal,)}, + { 'id' : 'metadata' + , 'name' : 'Metadata' + , 'action': 'string:${object_url}/metadata_edit_form' + , 'permissions' : (CMFCorePermissions.ModifyPortalContent,), + }, + { 'id' : 'xml' + , 'name' : 'XML' + , 'action': 'string:${object_url}/zapp_cmf_xml_form' + , 'permissions' : (CMFCorePermissions.ManagePortal,) + , 'visible' : 1, + }, + { 'id' : 'relations' + , 'name' : 'Relationships' + , 'action': 'string:${object_url}/zapp_cmf_view_relations' + , 'permissions' : (CMFCorePermissions.ManagePortal,) + , 'visible' : 1, + }, + ), + }, + {'id': 'ZApp CMF ZODB File', + 'title':'', + 'meta_type' : ZApp_CMF_ZODBFile.meta_type, + 'product': 'ZApp', + 'description':'File Content type based on ZApp objects using ZODB for storage', + 'icon':'file_icon.gif', + 'factory': 'addZAppCMFZODBFile', + 'immediate_view': 'file_edit_form', + 'actions': ({'id': 'view', + 'name': 'View', + 'action': 'file_view', + 'permissions': (CMFCorePermissions.View,), + }, + {'id': 'edit', + 'name': 'Edit', + 'action': 'file_edit_form', + 'permissions': (CMFCorePermissions.ModifyPortalContent,), + }, + {'id': 'edit external', + 'name': 'Edit External', + 'action': 'zapp_cmf_object_edit_form', + 'permissions': (CMFCorePermissions.ModifyPortalContent,)}, + {'id': 'editXternalType', + 'name': 'Edit External Type', + 'action': 'zapp_cmf_object_type_edit_form', + 'permissions': (CMFCorePermissions.ManagePortal,)}, { 'id' : 'metadata' , 'name' : 'Metadata' *************** *** 1022,1026 **** initCMFObjectMetadata(o) ! if klass not in [ZApp_CMFBase, ZApp_CMF_FSObject, ZApp_CMF_FSImage, ZApp_CMF_FSFolder, ZApp_CMF_ZODBImage]: return o --- 1142,1146 ---- initCMFObjectMetadata(o) ! if klass not in [ZApp_CMFBase, ZApp_CMF_FSObject, ZApp_CMF_FSImage, ZApp_CMF_FSFolder, ZApp_CMF_ZODBImage, ZApp_CMF_ZODBFile]: return o *************** *** 1037,1040 **** --- 1157,1166 ---- return addZAppCMFObject(self, id, title, klass, useExisting) + def addZAppCMFZODBFile(self, id, title='', klass=ZApp_CMF_ZODBFile, useExisting=1): + """ + add a CMF_ZODBImage object.. pass in the right class... + """ + return addZAppCMFObject(self, id, title, klass, useExisting) + def addZAppCMFFSFolder(self, id, title='', klass=ZApp_CMF_FSFolder, useExisting=1): """ |
|
From: Steve S. <ssp...@us...> - 2004-05-26 15:13:58
|
Update of /cvsroot/zapp/ZApp/Extensions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15366/Extensions Modified Files: Install.py Log Message: added manage_beforeDelete.. and better factoring of path calculations.. Index: Install.py =================================================================== RCS file: /cvsroot/zapp/ZApp/Extensions/Install.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Install.py 25 Jun 2003 11:45:53 -0000 1.1 --- Install.py 26 May 2004 15:13:47 -0000 1.2 *************** *** 41,45 **** # configured. addDirectoryViews(skinstool, 'skins', zapp_globals) ! out.write("Added 'hec' directory view to portal_skins\n") # --------------------- # Now we need to go through the skin configurations and insert --- 41,45 ---- # configured. addDirectoryViews(skinstool, 'skins', zapp_globals) ! out.write("Added 'skins' directory view to portal_skins\n") # --------------------- # Now we need to go through the skin configurations and insert |
|
From: Steve S. <ssp...@us...> - 2004-05-26 10:21:17
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22684 Modified Files: ZApp_CMFBase.py Log Message: fix manage_afterAdd for ZODB images. Index: ZApp_CMFBase.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** ZApp_CMFBase.py 24 May 2004 15:26:06 -0000 1.51 --- ZApp_CMFBase.py 26 May 2004 10:21:04 -0000 1.52 *************** *** 744,747 **** --- 744,748 ---- meta_type = 'ZApp CMF ZODB Image' zapp_cmf_type = 1 + data = '' isPrincipiaFolderish = 0 isAnObjectManager = 0 *************** *** 768,772 **** checkRecursion = self.ZAppBase_manage_afterAdd(item, container) ! if not checkRecursion: Image.manage_afterAdd(self, item, container) ZApp_Base.manage_afterAdd(self, item, container) --- 769,773 ---- checkRecursion = self.ZAppBase_manage_afterAdd(item, container) ! if checkRecursion: Image.manage_afterAdd(self, item, container) ZApp_Base.manage_afterAdd(self, item, container) |
|
From: Steve S. <ssp...@us...> - 2004-05-24 15:26:18
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7273 Modified Files: ZApp_CMFBase.py Log Message: set debug_level back to zero... Index: ZApp_CMFBase.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** ZApp_CMFBase.py 24 May 2004 15:20:00 -0000 1.50 --- ZApp_CMFBase.py 24 May 2004 15:26:06 -0000 1.51 *************** *** 21,25 **** missing = [] ! dbug_level = 100 # 100 # make 100 to blather about various CMF related events.. lpcol = LeverPropertyCollection --- 21,25 ---- missing = [] ! dbug_level = 0 # 100 # make 100 to blather about various CMF related events.. lpcol = LeverPropertyCollection |
|
From: Steve S. <ssp...@us...> - 2004-05-24 15:21:01
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5693 Modified Files: ZApp_CMFBase.py ZApp_MiscData.py Log Message: add multiple dataType support in cut/copy/paste Index: ZApp_MiscData.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_MiscData.py,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** ZApp_MiscData.py 30 Mar 2004 17:06:26 -0000 1.28 --- ZApp_MiscData.py 24 May 2004 15:20:20 -0000 1.29 *************** *** 157,161 **** "WITH SELF COMPUTE miscDataManager = self.getMiscDataManager()", "WITH SELF COMPUTE safeMiscData=self.miscData or self.setupMiscData()", ! "WHEN OBJECT DELETED CALL self.miscData and self.miscData.manage_delete()", ) --- 157,161 ---- "WITH SELF COMPUTE miscDataManager = self.getMiscDataManager()", "WITH SELF COMPUTE safeMiscData=self.miscData or self.setupMiscData()", ! "WHEN OBJECT DELETED CALL self.deleteAllMiscData()", ) *************** *** 217,220 **** --- 217,235 ---- return mdm + def getAllMiscData(self): + """ + retrieve all the misc data objects for this object.. + """ + mds = self.getMiscDataSpecialist() + return mds.ZApp_getItems( objectID = self.getMiscObjectID(), Manager = self.miscDataManager ) # get all misc data objects + + def deleteAllMiscData(self): + """ + remove all my misc data objects. + """ + + for mdObj in self.getAllMiscData(): + mdObj.manage_delete() + def setupMiscData(self, Manager=None, dataType='', checked=0): """ Index: ZApp_CMFBase.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** ZApp_CMFBase.py 5 Apr 2004 03:30:53 -0000 1.49 --- ZApp_CMFBase.py 24 May 2004 15:20:00 -0000 1.50 *************** *** 164,168 **** so that the copy can retrieve it once created...""" ! ZApp_LOG("_notifyOfCopyTo: " + container.getId() + ":" + `op` + ":" + `notify_depth`, dbug_level) if notify_depth > 20: --- 164,168 ---- so that the copy can retrieve it once created...""" ! ZApp_LOG("_ZCMFnotifyOfCopyTo: " + container.getId() + ":" + `op` + ":" + `notify_depth`, dbug_level) if notify_depth > 20: *************** *** 182,188 **** --- 182,192 ---- safeStorageID = safeStorage.getId() self.change(safeStorageID = safeStorageID, cmf_portal_type=self.portal_type ) + + ZApp_LOG("_ZCMFnotifyOfCopyTo: mySafeStorageID is now:(1) " + self.safeStorageID, dbug_level) get_transaction().commit(1) + ZApp_LOG("_ZCMFnotifyOfCopyTo: mySafeStorageID is now:(2) " + self.safeStorageID, dbug_level) + ZApp_LOG("do subobject notify: safeStorageID:" + safeStorage.getId() + ":self.id:" + selfID + ":Manager:" + mdmManager, dbug_level) self._subobjectNotify( op, mdm, notify_depth, safeStorage) *************** *** 249,254 **** newSelf = mySpec.ZApp_createNewItem(id=self.calcPathID()) mySpec.commit_subtransaction() ! ! newSelf.setMiscData( dataDict = oldSelf.safeMiscData.getXMLDict()) newSelf.change(safeStorageID = '', cmf_portal_type=self.portal_type) mySpec.commit_subtransaction() --- 253,261 ---- newSelf = mySpec.ZApp_createNewItem(id=self.calcPathID()) mySpec.commit_subtransaction() ! ! for mdObj in oldSelf.getAllMiscData(): ! if mdObj.dataType != 'copyPasteStorage': ! newSelf.setMiscData( dataDict = mdObj.getXMLDict(), dataType = mdObj.dataType) # move data from each data type to new instance ! newSelf.change(safeStorageID = '', cmf_portal_type=self.portal_type) mySpec.commit_subtransaction() *************** *** 277,283 **** --- 284,292 ---- """ if getattr(self,'_v_in_manage_afterAdd',0): + ZApp_LOG("ZAppRecursionLock... already locked", dbug_level) return 0 else: self._v_in_manage_afterAdd = 1 + ZApp_LOG("ZAppRecursionLock... locking", dbug_level) return 1 *************** *** 286,289 **** --- 295,299 ---- clear the recursion lock. """ + ZApp_LOG("ZAppRecursionLock... clearing lock", dbug_level) del self._v_in_manage_afterAdd *************** *** 307,313 **** safeStorage = mdm.getItem(safeStorageID) if safeStorage: self.ZAppCMF_afterAdd( safeStorage, newID) safeStorage.manage_delete() ! del self._v_safeStorageID # we've got it now.. thanks. ;-) --- 317,326 ---- safeStorage = mdm.getItem(safeStorageID) if safeStorage: + ZApp_LOG("ZAppBase_manage_afterAdd: found safe storage", dbug_level) self.ZAppCMF_afterAdd( safeStorage, newID) safeStorage.manage_delete() ! else: ! ZApp_LOG("ZAppBase_manage_afterAdd: no safe storage", dbug_level) ! del self._v_safeStorageID # we've got it now.. thanks. ;-) *************** *** 323,327 **** checkRecursion = self.ZAppBase_manage_afterAdd(item, container) ! if not checkRecursion: SkinnedFolder.manage_afterAdd(self, item, container) ZApp_Base.manage_afterAdd(self, item, container) --- 336,340 ---- checkRecursion = self.ZAppBase_manage_afterAdd(item, container) ! if checkRecursion: SkinnedFolder.manage_afterAdd(self, item, container) ZApp_Base.manage_afterAdd(self, item, container) |
|
From: Steve S. <ssp...@us...> - 2004-05-24 15:20:39
|
Update of /cvsroot/zapp/ZApp/www_ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5693/www_ui Modified Files: quickDisplay_html.plain Log Message: add multiple dataType support in cut/copy/paste Index: quickDisplay_html.plain =================================================================== RCS file: /cvsroot/zapp/ZApp/www_ui/quickDisplay_html.plain,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** quickDisplay_html.plain 4 Feb 2004 12:06:08 -0000 1.12 --- quickDisplay_html.plain 24 May 2004 15:20:22 -0000 1.13 *************** *** 5,8 **** --- 5,21 ---- Title: + <SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript"> + <!-- + function checkall() { + for(var i=0; i<document.deleteForm.elements.length; i++) { + var e = document.deleteForm.elements[i]; + if ( e.name.slice(0,3) == 'ids' ) { + e.checked = document.deleteForm.check_allbox.checked; + } + } + } + //--> + </SCRIPT> + <a href="&dtml-URL2;/index_html">One level up.. (<dtml-var "aq_parent.id">)</a><br><br> <dtml-call "REQUEST.set('size',REQUEST.get('size',20))"> *************** *** 77,81 **** </div> ! <form action="deleteSelectedItems_html" method="post"> <dtml-in searchResults> <dtml-let itemID=sequence-item --- 90,94 ---- </div> ! <form name="deleteForm" action="deleteSelectedItems_html" method="post"> <dtml-in searchResults> <dtml-let itemID=sequence-item *************** *** 89,93 **** <dtml-if sequence-start> ! <tr><td> </td> </dtml-if> --- 102,106 ---- <dtml-if sequence-start> ! <tr><td><input type="checkbox" name="check_allbox" onClick="checkall();"></td> </dtml-if> |
|
From: Steve S. <ssp...@us...> - 2004-05-24 15:20:38
|
Update of /cvsroot/zapp/ZApp/skins/zapp_generic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5693/skins/zapp_generic Modified Files: zapp_cmf_object_edit_form.pt Log Message: add multiple dataType support in cut/copy/paste Index: zapp_cmf_object_edit_form.pt =================================================================== RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_object_edit_form.pt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** zapp_cmf_object_edit_form.pt 2 Apr 2004 14:26:59 -0000 1.9 --- zapp_cmf_object_edit_form.pt 24 May 2004 15:20:21 -0000 1.10 *************** *** 33,37 **** miscDataSpecialist myApp/MiscData; typePropertiesObjects python:miscDataSpecialist.ZApp_getItems(Manager=cmfSpec.getId(), objectID='metaObject', dataType='ZCMFPropsFor' + myType); ! myTPropsMiscData python:typePropertiesObjects and typePropertiesObjects[0].getXMLDict(); myPropSet python:myTPropsMiscData.get('zapp_properties',[]); myProperties python:here.safeMiscData.getXMLDict()"> --- 33,37 ---- miscDataSpecialist myApp/MiscData; typePropertiesObjects python:miscDataSpecialist.ZApp_getItems(Manager=cmfSpec.getId(), objectID='metaObject', dataType='ZCMFPropsFor' + myType); ! myTPropsMiscData python:(typePropertiesObjects and typePropertiesObjects[0].getXMLDict()) or {}; myPropSet python:myTPropsMiscData.get('zapp_properties',[]); myProperties python:here.safeMiscData.getXMLDict()"> |
|
From: Steve S. <ssp...@us...> - 2004-05-24 15:20:36
|
Update of /cvsroot/zapp/ZApp/manage_ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5693/manage_ui Modified Files: leverActionsForm.dtml Log Message: add multiple dataType support in cut/copy/paste Index: leverActionsForm.dtml =================================================================== RCS file: /cvsroot/zapp/ZApp/manage_ui/leverActionsForm.dtml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** leverActionsForm.dtml 16 Mar 2004 20:56:31 -0000 1.11 --- leverActionsForm.dtml 24 May 2004 15:20:21 -0000 1.12 *************** *** 53,57 **** </dtml-let> <dtml-if sequence-end> ! <tr><td><input type="checkbox" name="check_allbox" checked onClick="checkall1()"</td><td align="left"> Check/UnCheck All</td></tr> </dtml-if> <dtml-else> --- 53,57 ---- </dtml-let> <dtml-if sequence-end> ! <tr><td><input type="checkbox" name="check_allbox" checked onClick="checkall1()"></td><td align="left"> Check/UnCheck All</td></tr> </dtml-if> <dtml-else> *************** *** 100,104 **** <tr><td><input type="checkbox" name="leverNames:list" value="&dtml-sequence-item;"></td><td align="left">&dtml-sequence-item;</td></tr> <dtml-if sequence-end> ! <tr><td><input type="checkbox" name="check_allbox3" onClick="checkall3()"</td><td align="left"> Check/UnCheck All</td></tr> </dtml-if> <dtml-else> --- 100,104 ---- <tr><td><input type="checkbox" name="leverNames:list" value="&dtml-sequence-item;"></td><td align="left">&dtml-sequence-item;</td></tr> <dtml-if sequence-end> ! <tr><td><input type="checkbox" name="check_allbox3" onClick="checkall3()"></td><td align="left"> Check/UnCheck All</td></tr> </dtml-if> <dtml-else> *************** *** 128,132 **** <tr><td><input type="checkbox" name="specialistIDs:list" value="&dtml-sequence-item;"></td><td align="left">&dtml-sequence-item;</td></tr> <dtml-if sequence-end> ! <tr><td><input type="checkbox" name="check_allbox" onClick="checkall2();"</td><td align="left"> Check/UnCheck All</td></tr> </dtml-if> <dtml-else> --- 128,132 ---- <tr><td><input type="checkbox" name="specialistIDs:list" value="&dtml-sequence-item;"></td><td align="left">&dtml-sequence-item;</td></tr> <dtml-if sequence-end> ! <tr><td><input type="checkbox" name="check_allbox" onClick="checkall2();"></td><td align="left"> Check/UnCheck All</td></tr> </dtml-if> <dtml-else> |
|
From: Steve S. <ssp...@us...> - 2004-05-23 21:42:50
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25388 Modified Files: ZApp_DublinCoreMixin.py ZApp_Specialist.py Log Message: prepare for Zope-2.7 compatability testing Index: ZApp_DublinCoreMixin.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_DublinCoreMixin.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ZApp_DublinCoreMixin.py 12 Jan 2004 14:25:16 -0000 1.2 --- ZApp_DublinCoreMixin.py 23 May 2004 21:42:09 -0000 1.3 *************** *** 89,94 **** for methodName in dir(DefaultDublinCoreImpl): ! theMethod = getattr(DefaultDublinCoreImpl,methodName) ! if methodName[:3] == 'set' and type(theMethod) == methodType: setattr(ZApp_DublinCoreMixin, methodName, ComputedAttribute(ZApp_MetaMethodInvoker( theMethod ).setInstance)) --- 89,94 ---- for methodName in dir(DefaultDublinCoreImpl): ! theMethod = getattr(DefaultDublinCoreImpl,methodName,None) ! if theMethod and methodName[:3] == 'set' and type(theMethod) == methodType: setattr(ZApp_DublinCoreMixin, methodName, ComputedAttribute(ZApp_MetaMethodInvoker( theMethod ).setInstance)) Index: ZApp_Specialist.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_Specialist.py,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** ZApp_Specialist.py 30 Mar 2004 17:06:26 -0000 1.40 --- ZApp_Specialist.py 23 May 2004 21:42:09 -0000 1.41 *************** *** 46,50 **** from Products.ZPatterns.Transactions import Kept from Products.PlugIns import PlugInFinder - from Sync import Synchronized from Globals import DTMLFile, MessageDialog, default__class_init__ --- 46,49 ---- *************** *** 69,73 **** Rack.getKlassAttr = getKlassAttr ! class UniqueIDGenerator( Synchronized ): def __init__(self): --- 68,72 ---- Rack.getKlassAttr = getKlassAttr ! class UniqueIDGenerator: def __init__(self): *************** *** 741,745 **** ! def setupClassInit(subClass = ZApp_Specialist): default__class_init__(subClass) MakePICBase(subClass) --- 740,747 ---- ! def setupClassInit(subClass = None): ! if subClass is None: ! subClass = ZApp_Specialist # default value ! default__class_init__(subClass) MakePICBase(subClass) *************** *** 747,751 **** setupClassInit() ! def manage_addZApp_Specialist(self, id, title='', rack='', leverSet='', REQUEST=None, URL1='Youre_lost', lsmID=DEFAULT_LEVER_SET_ID, subClass=ZApp_Specialist): ''' Adds a ZApp Specialist (or a subClass) to the current folder. --- 749,753 ---- setupClassInit() ! def manage_addZApp_Specialist(self, id, title='', rack='', leverSet='', REQUEST=None, URL1='Youre_lost', lsmID=DEFAULT_LEVER_SET_ID, subClass=None): ''' Adds a ZApp Specialist (or a subClass) to the current folder. *************** *** 756,759 **** --- 758,764 ---- ''' + if subClass is None: + subClass = ZApp_Specialist # default value + ob = subClass(id, title) self._setObject(id, ob) *************** *** 778,783 **** return self.manage_main(self,REQUEST,update_menu=1) ! def initialize(context, subClass=ZApp_Specialist, addMethod=manage_addZApp_Specialist, addForm=manage_addZApp_SpecialistForm): context.registerClass( subClass, --- 783,791 ---- return self.manage_main(self,REQUEST,update_menu=1) ! def initialize(context, subClass=None, addMethod=manage_addZApp_Specialist, addForm=manage_addZApp_SpecialistForm): + if subClass is None: + subClass = ZApp_Specialist # default value + context.registerClass( subClass, |
Update of /cvsroot/zapp/ZApp/help In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25388/help Modified Files: ZApp_Application.py ZApp_Base.py ZApp_CMFBase.py ZApp_MiscData.py ZApp_RelationshipItem.py ZApp_RelationshipManager.py ZApp_Specialist.py Log Message: prepare for Zope-2.7 compatability testing Index: ZApp_Base.py =================================================================== RCS file: /cvsroot/zapp/ZApp/help/ZApp_Base.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ZApp_Base.py 5 Feb 2004 17:27:32 -0000 1.1 --- ZApp_Base.py 23 May 2004 21:42:14 -0000 1.2 *************** *** 5,11 **** """ - lever_object_type = 'Lever Property Collection' - - class LeverProperty: """ --- 5,8 ---- *************** *** 13,19 **** """ - lever_object_type = 'Lever Property' - - class ZApp_Base: """ --- 10,13 ---- *************** *** 25,29 **** return primary key of self.. """ - return self._v_dm_.defaultRack.loadAttrib or 'pk' def applicationURL(self): --- 19,22 ---- *************** *** 31,39 **** get app url.. """ - return self.findApplication().absolute_url() def getMySpecialist(self): """ get my specialist """ - return self._v_dm_.aq_inner.aq_parent def change(self, props=None, REQUEST=None, **kw): --- 24,30 ---- *************** *** 42,54 **** """ - argDict = self.get_argument_dictionary( props, REQUEST, kw) - - ZApp_LOG("changing " + self.getMySpecialist().getId() + ":" + self.id + ":" + `argDict`) - - self.beforeChange() - self.manage_changeProperties(argDict) - self.afterChange() - return argDict - def findApplication(self): """ --- 33,36 ---- *************** *** 56,79 **** """ - currObject = self - - while 1: - if (not currObject) or (not hasattr(currObject, 'meta_type')): - raise RuntimeError, "Hmm. thaf's odd.. I can't find any ZApp Application here!" - - if currObject.meta_type == self.applicationMetaType: - break - - if hasattr(currObject, 'objectIds') and currObject.objectIds( ZApp_Application.ZApp_Application.meta_type ): - apps = currObject.objectValues( ZApp_Application.ZApp_Application.meta_type ) - result = apps and apps[0] - if result: - currObject = result - break - - currObject = currObject.aq_parent - - return currObject - def extendProperties( klass, propCollection, dumb_security=1): """ --- 38,41 ---- *************** *** 81,140 **** """ - if not hasattr(propCollection, 'lever_object_type'): - # - # backward compatibility.. - # - - result = extendProperties_list( klass, propCollection) - - else: - newProps = [] - propMap = {} - copyProperties = [] - - for i in range(len(klass._properties)): - prop = klass._properties[i] - propMap[prop['id']] = copyProp = prop.copy() - copyProperties.append(copyProp) - - for prop in propCollection: - propID = prop.id - if propMap.has_key( propID ): - theDict = propMap[ propID ] # we already have this property set up.. you can add to it.. but be careful! - else: - theDict = {} - newProps.append( theDict ) - - pdict = prop.getPropDictionary( propCollection, begin_with=theDict ) - defaultType = theDict.get('prop_type', theDict['type_default']) - theDict.setdefault('type',defaultType) - theDict.setdefault('dbType', defaultType) - theDict.setdefault('dbSize', theDict.get('size_default',30)) - setattr(klass, ('class_default_for_%s' % prop.id), theDict['prop_default']) - - klass._properties = tuple(copyProperties) + tuple(newProps) - - if dumb_security: - klass.__allow_access_to_unprotected_subobjects__ = 1 - - return joinListishes( klass ) - def listisheRecurse(klass, lName, currDict=None): """ recursive desecent into base classes.. """ - if currDict is None: - currDict = {'listishe_masterList':[]} - - for bKlass in klass.__bases__: - currDict = listisheRecurse(bKlass, lName, currDict) - - for item in getattr(klass, lName, []): - if not currDict.has_key(item): - currDict['listishe_masterList'].append(item) - currDict[item] = 1 - return currDict - def joinListishes(klass): """ --- 43,51 ---- *************** *** 142,153 **** """ - for lName in ['_indexed_attrs', '_custom_skin_scripts']: - flatDict = listisheRecurse(klass, lName) - setattr(klass,lName,flatDict['listishe_masterList']) - - for lName in ['__per_transaction_cache_attrs__']: - flatDict = listisheRecurse(klass, lName) - setattr(klass,lName,tuple(flatDict['listishe_masterList'])) - def extendProperties_list( klass, props, value_default='', type_default='string', size_default=30 ): --- 53,56 ---- *************** *** 162,193 **** """ - newProps = [] - - for prop in props: - - prop_id = prop[0] - - if len(prop) < 2: - prop_default = value_default - else: - prop_default = prop[1] - - if len(prop) >= 3: - prop_type = prop[2] - else: - prop_type = type_default - - if len(prop) >= 4: - sqlType = prop[3] - else: - sqlType = prop_type - - if len(prop) >= 5: - sqlSize = prop[4] - else: - sqlSize = size_default - - newProps.append({'id':prop_id, 'type':prop_type, 'mode':'w', 'sqlType':sqlType, 'defaultValue':prop_default, 'sqlSize':sqlSize}) - setattr(klass, 'class_default_for_' + prop_id, prop_default) - - klass._properties = klass._properties + tuple(newProps) --- 65,66 ---- Index: ZApp_Application.py =================================================================== RCS file: /cvsroot/zapp/ZApp/help/ZApp_Application.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ZApp_Application.py 5 Feb 2004 17:27:32 -0000 1.1 --- ZApp_Application.py 23 May 2004 21:42:10 -0000 1.2 *************** *** 70,78 **** """ - updateMethodsInFolder(self, getUIMethods(ui_method_names)) - - if REQUEST: - return MessageDialog(title='OK', message = ' ZApp FS Application Methods Updated.', action='manage_main') - def SQLConnectionIDs(self): """ --- 70,73 ---- *************** *** 80,90 **** """ - return Products.ZSQLMethods.SQL.SQLConnectionIDs( self ) - def findZApp_Application(self): """ find the Application Objects.. """ - return self def getException(self): --- 75,82 ---- *************** *** 92,99 **** get and format an exception """ - f = StringIO() - traceback.print_exc(file=f) - f.seek(0) - return f.read() def changeLevers(self, leverSet, specialistIDs=None, lmsID='', clearOutAllOldLMS=0): --- 84,87 ---- *************** *** 101,141 **** Set the ZApp_Specialists lever set to leverSet... """ - resultList = [] - - if not lmsID: - lmsID=DEFAULT_LEVER_SET_ID - - specialists = self.ZopeFind(self, obj_metatypes=self.specialistMetaTypes, search_sub=1) - - if specialists: - for p, spec in specialists: - if spec.getId() in specialistIDs: - resultList.append("running in " + `p` + ":" + `spec.getId()`) - try: - if leverSet: - if clearOutAllOldLMS: - theIDs = spec.objectIds('ZApp Lever Method Sets') - spec.LeversSetsGroup.manange_delObjects(theIDs) - - lms = getattr(spec.aq_inner.aq_base,lmsID,'') - if not lms: - spec.LeversSetsGroup._constructPlugIn("ZApp Lever Method Sets", id=lmsID) - lms = getattr(spec.aq_inner.aq_base,lmsID,'') - if not lms: - raise RuntimeError, "Cannot create a Lever Method Set here.. " - - lms=getattr(spec, lmsID,'') # get lms wrapped this time! - lms.manage_changeProperties(myLeverSet=leverSet) - - resultList.append("created/updated lever Set! for %s" % spec.getId()) - else: - resultList.append("did you specify a lever set?") - except: - resultList.append("failed to create leverSet" + self.getException()) - - else: - resultList.append(" can't find any specialists there.. ") - - return self.manage_leverResults(message = string.join(resultList,'\n'), action='manage_main') def runAllLevers(self, leverNames=None, specialistIDs='', dbName='', safeLevers=1): --- 89,92 ---- *************** *** 144,157 **** """ - results = [] - - if leverNames is None: - leverNames = [] - - for leverName in leverNames: - results.append(self.runSingleLever(leverName = leverName, dbName=dbName, specialistIDs=specialistIDs, safeLevers=safeLevers)) - - return self.manage_leverResults(message = string.join(results,'\n'), action='manage_main') - def runSingleLever(self, leverName='createItemLever', dbName='', specialistIDs='', specialistMetaTypes='', catalogName='', safeLevers=1): --- 95,98 ---- *************** *** 160,183 **** """ - if not dbName: - ids = self.SQLConnectionIDs() # should be a method of the application.. - dbName = (ids and ids[0] and ids[0][0]) or 'ZApp_Catalog' - - if not catalogName: - ids = self.objectIds('Z Catalog') - catalogName = (ids and ids[0]) - - - if not specialistMetaTypes: - if self.hasProperty('specialistMetaTypes'): - specialistMetaTypes = self.specialistMetaTypes - else: - specialistMetaTypes = ['Specialist','Z App Specialist'] - - return self.runLever(leverName=leverName, dbName=dbName, specialistIDs=specialistIDs, - specialistMetaTypes=specialistMetaTypes, - catalogName=catalogName, - safeLevers=safeLevers) - def runLever(self, leverName='createSQLLever', dbName='test_db', specialistIDs=None, specialistMetaTypes=None, catalogName='', safeLevers=1): """ --- 101,104 ---- *************** *** 185,217 **** """ - resultList = ['Running Lever: %s \n' % leverName] - - resultList.append("looking in " + self.getId() + " for " + `specialistMetaTypes`) - - specialists = self.findSpecialistIDs(specialistIDs, returnObjects=1) - if specialists: - for p, spec in specialists: - resultList.append("running in " + `p` + ":" + `spec.getId()`) - leverMethod = spec.getLeverMethodForLever( leverName ) - if leverMethod: - if safeLevers and (not leverMethod.safeLever): - resultList.append("Not allowed to run this lever.. safe levers only.. ") - continue - spec = spec.__of__(leverMethod) - for rack in spec.rackList: - rack = rack.__of__(spec) - resultList.append("checking rack: " + `rack`) - resultList.append("Processing " + `rack.getId()`) - try: - lever = getattr(rack, leverName) - resultList.append(`lever(dbName=dbName, catalogName=catalogName)`) - except: - f = StringIO() - traceback.print_exc(file=f) - f.seek(0) - resultList.append("Ahh!!!" + f.read()) - else: - resultList.append(" can't find any specialists there.. ") - - return string.join(resultList,'\n') - --- 106,107 ---- Index: ZApp_RelationshipItem.py =================================================================== RCS file: /cvsroot/zapp/ZApp/help/ZApp_RelationshipItem.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ZApp_RelationshipItem.py 5 Feb 2004 17:27:32 -0000 1.1 --- ZApp_RelationshipItem.py 23 May 2004 21:42:14 -0000 1.2 *************** *** 8,19 **** return the object represented by this relationship item.. """ - theApp = self.findApplication() - specCache = theApp._v_SpecialistsCache - theObject = None - theSpecialistPath = '%s' % '/'.join(specCache.get(self.objectManager,None)) - theSpecialist = theApp.restrictedTraverse( theSpecialistPath ) - if theSpecialist: - theObject = theSpecialist.__of__(theApp).getItem(self.objectID) - - return theObject - --- 8,9 ---- Index: ZApp_Specialist.py =================================================================== RCS file: /cvsroot/zapp/ZApp/help/ZApp_Specialist.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ZApp_Specialist.py 5 Feb 2004 17:27:32 -0000 1.2 --- ZApp_Specialist.py 23 May 2004 21:42:14 -0000 1.3 *************** *** 13,17 **** property used to modify order of lever application. """ - return self.getId() def getPrimaryKey(self): --- 13,16 ---- *************** *** 19,24 **** Get the primary key for the objects managed by this specialist... """ - - return self.defaultRack.loadAttrib or 'pk_id' def commit_subtransaction(self): --- 18,21 ---- *************** *** 26,30 **** Commit the current subtransaction.. """ - check_commit(1) def final_commit(self): --- 23,26 ---- *************** *** 32,36 **** do a full-final-total commit. """ - get_transaction().commit() def findApplication(self): --- 28,31 ---- *************** *** 39,55 **** """ - currObject = self - app_meta = self.applicationMetaType - - while 1: - if not currObject: - raise RuntimeError, "Hmm. that doesn't make any sense!.. there is no application!" - - if currObject.meta_type == app_meta: - break - - currObject = currObject.aq_parent - - return currObject def getLeverMethodForLever(self, methodName): --- 34,37 ---- *************** *** 58,69 **** """ - theApp = self.findApplication() - for leverSetsLever in self.leverList: - theLever = getattr(theApp, leverSetsLever.myLeverSet, '') - if theLever: - theLever.checkLoaded() - theMethod = getattr(theLever, methodName, '') - if theMethod: - return theLever def hasQuerySearchDirect(self): --- 40,43 ---- *************** *** 73,94 **** As we add other levers.. this needs to be more intelligent! """ - - return 1 def ZApp_cleanDate(self, theDate): """ Clean up a date """ - if theDate.year() > 1100: - return theDate - else: - now = DateTime() - - return "%i/%i/%i" % (now.year(), now.month(), now.day()) - def newKey(self): """ return a new item key. """ - return self.getNewKey() def ZApp_getDDSFromObjectList(self, objList=None): --- 47,58 ---- *************** *** 97,122 **** """ - if objList is None: - return [] - - result = [] - pk = self.getPrimaryKey() - addProp = result.append - pm = self.ZApp_getPropertyMap() - - for obj in objList: - dd = {pk: obj.id} - for prop in pm: - pid = prop['id'] - dd[pid] = getattr(obj, pid, prop.get('prop_default','')) - - addProp(dd) - return result - def ZApp_createFauxResult(self, data_dictionary): """ Create a set of 'results' with one instance only.. """ - return self.ZApp_createFauxResults(data_dictionaries=[data_dictionary]) def ZApp_createFauxResults(self, data_dictionaries=None, objList=None): --- 61,68 ---- *************** *** 124,144 **** Create a set of 'results' with a list of instances. """ - if data_dictionaries is None: - data_dictionaries = self.ZApp_getDDSFromObjectList( objList ) - - items = [] - data = [] - put = items.append - dput = data.append - for i in range(len(data_dictionaries)): - data_item = {} - dput(data_item) - data_dictionary = data_dictionaries[i] - for name in data_dictionary.keys(): - if i==0: - put({'name':name}) - data_item[name] = data_dictionary.get(name,'') - - return Results((items, data)) def ZApp_insertNewItem(self, conditions=None, displayQuery=None, **kw): --- 70,73 ---- *************** *** 156,244 **** """ - newID = self.newKey() - props = {self.getPrimaryKey():newID} - - pm = self.ZApp_getPropertyMap() - - for prop in pm: - props[prop['id']] = prop.get('dbDefault',prop.get('prop_default','')) - - if conditions: - props.update(conditions) - - if kw: - props.update(kw.copy()) - - if displayQuery: - return self.insertItem( REQUEST=props, src__=1 ) - - self.insertItem( REQUEST=props ) - self._toCache( newID, self.ZApp_createFauxResult( props )) - return newID def ZApp_createNewItem(self, properties=None, **kw): """ Create a new instance .. """ - newID = (properties and properties.get('id',None)) or \ - kw.get('id',None) or self.REQUEST.get('id',None) or None - - newItem = self.newItem(newID) - - if properties is None: - properties = {} - - properties.update(kw) - - if not properties: - properties.update(self.REQUEST.form) - properties.update(self.REQUEST.other) - - if properties: - newItem.change(properties) - - return newItem def ZApp_createNewNumericID(self): """ get a fresh numeric ID """ - return self.localeID() + `UIDGen.nextID()` def ZApp_deleteAllInstances(self): """ delete all my instances.. """ - theList = [] - - for item in self.ZApp_getItemIds(): - theList.append(item) - - for item in theList: - x = self.getItem(item) - x.manage_delete() - - return theList + ['OK!'] def ZApp_deleteSelectedItems(self, ids): """ delete only selected instances """ - itemList = [] - - for itemID in ids: - itemList.append( self.getItem(itemID)) - - for item in itemList: - item.manage_delete() - - return "OK!" def ZApp_editSelectedItems(self, ids, items): """ edit only selected instances """ - for item in items: - id = item['id'] - if id in ids: - theItem = self.getItem( id ) - theItem.change( props=item.copy()) - - return "OK!" def ZApp_getDefaultDictionary(self, typeString=0): --- 85,108 ---- *************** *** 248,279 **** if typeString is 'true' the value of each item will be an appropriate type string """ - dict = {} - - pm = self.ZApp_getPropertyMap() - - if typeString: - newPM = [] - for i in range(len(pm)): - item = {} - newPM.append(item) - item.update(pm[i]) - itemType = type(item['prop_default']) - if itemType == type(''): - item['prop_default'] = '%(' + item['id']+ ')s' - elif itemType == type(0): - item['prop_default'] = '%(' + item['id'] + ')i' - elif itemType == type(1.0): - item['prop_default'] = '%(' + item['id'] + ')f' - pm = tuple(newPM) - - [dict.setdefault(x['id'],x['prop_default']) for x in pm] - pk = self.getPrimaryKey() - - if typeString: - dict[pk]='%(' + pk + ')s' - else: - dict[pk]='' - - return dict def ZApp_getPropertyMap(self): --- 112,115 ---- *************** *** 285,293 **** """ - return tuple(filter( lambda x:x.get('id','') != 'title', - map( lambda dict: dict.copy(), - self.ZApp_getItemClassAttr('_properties')) - ) - ) def ZApp_getIndexedAttributes(self): --- 121,124 ---- *************** *** 295,299 **** return a list of indexed attributes for this class.. """ ! return self.ZApp_getItemClassAttr('_indexed_attrs') def ZApp_getInsertQueryPrefix(self): --- 126,130 ---- return a list of indexed attributes for this class.. """ ! def ZApp_getInsertQueryPrefix(self): *************** *** 301,305 **** return an insert query prefix. """ ! return self.ZApp_getItemClassAttr('_insertQueryPrefix') def ZApp_getCustomSkinScripts(self): --- 132,136 ---- return an insert query prefix. """ ! def ZApp_getCustomSkinScripts(self): *************** *** 307,311 **** return a list of custom skin scripts for this Specialists storage class.. """ - return self.ZApp_getItemClassAttr('_custom_skin_scripts') def ZApp_getPrimaryKeyGenerator(self): --- 138,141 ---- *************** *** 313,317 **** return a primary key generator string. """ - return self.ZApp_getItemClassAttr('_primaryKeyGenerator') def ZApp_getDefaultStringSize(self): --- 143,146 ---- *************** *** 319,323 **** return a default string size for dbSize... """ - return self.ZApp_getItemClassAttr('_defaultStringSize',30) def ZApp_getPrimaryKeySize(self): --- 148,151 ---- *************** *** 325,329 **** return a default string size for dbSize... """ ! return self.ZApp_getItemClassAttr('_primaryKeyStringSize',40) def ZApp_getItemClassAttr(self, attr, default=None): --- 153,157 ---- return a default string size for dbSize... """ ! def ZApp_getItemClassAttr(self, attr, default=None): *************** *** 331,335 **** Return the class for objects managed by this ZApp_Specialist. """ - return self.defaultRack.getKlassAttr( attr, default ) def ZApp_getReferenceLookup(self): --- 159,162 ---- *************** *** 356,382 **** """ - missing = [] - - refLookup = getattr(self, 'ZApp_referenceLookup', missing) - - if refLookup is missing: - refLookup = self.ZApp_getItemClassAttr('ZApp_referenceLookup', {}) - - if hasattr( refLookup, 'func_code' ) or hasattr( refLookup, '__call__'): - refLookup = refLookup() - - if type(refLookup) == type(''): - refLookup = refLookup.split('\n') - - if type(refLookup) == type([]): - result = {} - for item in refLookup: - if type(item) == type(''): - rList = item.strip().split(':') - if len(rList) >= 3: - result[ rList[0] ] = [ rList[1], rList[2] ] - refLookup = result - - return refLookup def ZApp_getAttributeList(self): --- 183,186 ---- *************** *** 387,422 **** """ - typeTable = { - 'date':'date', - 'string':'', - 'text':'text', - 'boolean':'int', - 'timestamp':'date', - } - - primaryKey = self.getPrimaryKey() - - itemList = [ (primaryKey, '', '') ] - - pm = self.ZApp_getPropertyMap() - - for item in pm: - itemID = item['id'] - itemType = item['type'] - mode = item.get('mode','') - init_method = item.get('form_init_method','') - - if init_method: - defaultVal = eval( init_method ) - else: - defaultVal = item.get('prop_default','') - - if itemID not in ('title','id'): - theType = typeTable.get(itemType,'') - if mode.find('w') == -1: - theType = 'ro_string' - itemList.append( (itemID, theType, defaultVal) ) - - return itemList def ZApp_doSelectItem(self, REQUEST=None, displayQuery=None): --- 191,194 ---- *************** *** 425,468 **** """ - if displayQuery is not None: - if self.selectItem.meta_type[:len('Script')] == 'Script': - result = self.selectItem(conditions = REQUEST, src__=1) - else: - result = self.selectItem(REQUEST = REQUEST, src__=1) - - return result - - if self.selectItem.meta_type[:len('Script')] == 'Script': - result = self.selectItem(conditions = REQUEST) - else: - result = self.selectItem(REQUEST = REQUEST) - - return result def ZApp_querySearchDirect(self, conditions=None, displayQuery=0, **kw): """ Call the query interface directly.. (used often for getting statistical info..) """ - if conditions is None: - conditions = {} - - conditions.update(kw) - - if not conditions: - conditions.update(getattr(self.REQUEST,'form',{})) - conditions.update(getattr(self.REQUEST,'other',{})) - - if displayQuery: - return self.ZApp_doSelectItem(REQUEST=conditions, src__=1) - - # - # return raw results.. - # - - if type(conditions) != type({}): - theForm = conditions.form - theForm.update(conditions.other) - conditions = theForm - - return self.ZApp_doSelectItem( REQUEST=conditions ) def ZApp_cachedSelectItemResult(self, itemID): --- 197,204 ---- *************** *** 473,562 **** """ - if itemID == ZAPP_TEMPORARY: - return fauxResult - - if not itemID: - raise RuntimeError, ("Can't be! got null id in %s.chachedSelectItemResult()" % self.id) - - queryResult = self._fromCache(itemID) - - if not queryResult: - ZApp_LOG( "result for %s not in cache... " % itemID) - - results = self.ZApp_doSelectItem( REQUEST={ self.getPrimaryKey(): itemID } ) - queryResult = (results and results[0]) or None # save in cache.. and return result.. - if queryResult: - self._toCache(itemID,queryResult) - ZApp_LOG( " %s got good result from real query for %s. Put in cache" % (self.id, itemID)) - else: - ZApp_LOG( " %s Got item %s from cache!" % (self.id, itemID)) - - return queryResult def ZApp_getItemIds(self, conditions=None, displayQuery=0, createIfNone=0, **kw): """ Get all my itemIds that match conditions.. """ - import string - - specName = self.id - - primaryKey = self.getPrimaryKey() - - theIDs = [] - - if conditions is None: - conditions = {} - - conditions.update(kw) - - if not conditions: - try: - conditions.update(self.REQUEST.form) - conditions.update(self.REQUEST.other) - except: - conditions = {} - - if displayQuery: - return self.ZApp_doSelectItem(REQUEST=conditions, displayQuery=displayQuery) - - results = self.ZApp_doSelectItem(REQUEST = conditions) - - ZApp_LOG( "ZApp_Specialist in %s.getItemIds(%s)" % (self.id, conditions) ) - - for dresult,result in map(None, results.dictionaries(), results): - try: - theID = getattr(result,string.upper(primaryKey)) - except AttributeError: - theID = getattr(result,primaryKey) - - ZApp_LOG("ZApp_Specialist found item %s='%s'." % (primaryKey,theID)) - - theIDs.append(theID) - self._toCache(theID,result) - - if not theIDs and createIfNone: - aNewItem = self.ZApp_createNewItem( conditions ) - theIDs.append(aNewItem.id) - - return theIDs def ZApp_getItems(self, conditions=None, createIfNone=0, displayQuery=0, **kw): """ get my items that match conditions """ - results = [] - - if conditions == None: - conditions = self.REQUEST.form.copy() - - if kw: - conditions.update(kw) - - if displayQuery: - return self.ZApp_getItemIds( conditions=conditions, createIfNone = createIfNone, displayQuery=displayQuery ) - - for itemID in self.ZApp_getItemIds( conditions=conditions, createIfNone = createIfNone ): - results.append(self.getItem( itemID )) - - return results class FauxResult: --- 209,220 ---- *************** *** 566,570 **** """ ! def manage_addZApp_Specialist(self, id, title='', rack='', leverSet='', REQUEST=None, URL1='Youre_lost', lsmID=DEFAULT_LEVER_SET_ID, subClass=ZApp_Specialist): ''' Adds a ZApp Specialist (or a subClass) to the current folder. --- 224,228 ---- """ ! def manage_addZApp_Specialist(self, id, title='', rack='', leverSet='', REQUEST=None, URL1='Youre_lost', lsmID=DEFAULT_LEVER_SET_ID, subClass=None): ''' Adds a ZApp Specialist (or a subClass) to the current folder. *************** *** 574,598 **** ''' - - ob = subClass(id, title) - self._setObject(id, ob) - ob = ob.__of__(self) - - if rack: - ob.RacksGroup._constructPlugIn(rack, id='defaultRack') - - if leverSet: - ob.LeversSetsGroup._constructPlugIn("ZApp Lever Method Sets", id=lsmID) - lsm = getattr(ob, lsmID, '') - lsm and lsm.manage_changeProperties(myLeverSet=leverSet) - - ob.LeversSetsGroup._constructPlugIn("ZApp Lever Method Sets", id='genericLeverSet') - lsm = getattr(ob, 'genericLeverSet', '') - lsm and lsm.manage_changeProperties(myLeverSet='genericLevers') - - if subClass != ZApp_Specialist: - return ob - - if REQUEST: - return self.manage_main(self,REQUEST,update_menu=1) - --- 232,233 ---- Index: ZApp_RelationshipManager.py =================================================================== RCS file: /cvsroot/zapp/ZApp/help/ZApp_RelationshipManager.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ZApp_RelationshipManager.py 5 Feb 2004 17:27:32 -0000 1.1 --- ZApp_RelationshipManager.py 23 May 2004 21:42:14 -0000 1.2 *************** *** 16,20 **** return the role object manager.. """ - return getattr(self, rRolesID) def getRelationshipItemManager(self): --- 16,19 ---- *************** *** 22,26 **** return the manager of relationship items.. """ - return getattr(self, rItemsID) def relateObjects(self, object1, object2, object1Role=None, object2Role=None, createIfNone=0, contextID=''): --- 21,24 ---- *************** *** 28,54 **** Relate two objects.. """ - newR = self.ZApp_createNewItem() - relIRolesMan = self.getRoleManager() - relItems = self.getRelationshipItemManager() - - role1ID='' - role2ID='' - - if object1Role: - role1IDs = relIRolesMan.ZApp_getItemIds( name=object1Role, objectType=object1.objectType, relatedObjectType=object2.objectType, createIfNone=createIfNone) - role1ID = role1IDs and role1IDs[0] - if not role1ID: - raise RuntimeError, ("No such role '%s'" % object1Role) - - if object2Role: - role2IDs = relIRolesMan.ZApp_getItemIds( name=object2Role, objectType=object2.objectType, relatedObjectType=object1.objectType, createIfNone=createIfNone) - role2ID = role2IDs and role2IDs[0] - if not role2ID: - raise RuntimeError, ("No such role '%s'" % object2Role) - - - rItem1 = relItems.ZApp_createNewItem(relationshipID=newR.id, objectID=object1.getPrimaryKeyValue(), objectManager=object1.Manager, roleID=role1ID) - rItem2 = relItems.ZApp_createNewItem(relationshipID=newR.id, objectID=object2.getPrimaryKeyValue(), objectManager=object2.Manager, roleID=role2ID, contextID=contextID) - return rItem1 def removeObjects(self, object1, object2=None, object1Role=None, object2Role=None, object2Type=None, object2Manager=None): --- 26,29 ---- *************** *** 56,88 **** Remove object relations between two objects.. """ - role1ID='' - role2ID='' - - o2Type='' - if object2: - o2Type=object2.objectType - elif object2Type: - o2Type=object2Type - - o2Manager='' - if object2: - o2Manager=object2.Manager - elif object2Manager: - o2Manger=object2Manager - - relIRolesMan = self.getRoleManager() - rItemsMan = self.getRelationshipItemManager() - - if object1Role: - role1IDs = relIRolesMan.ZApp_getItemIds( name=object1Role, objectType=object1.objectType, relatedObjectType=o2Type) - role1ID = role1IDs and role1IDs[0] - - if object2Role: - role2IDs = relIRolesMan.ZApp_getItemIds( name=object2Role, objectType=o2Type, relatedObjectType=object1.objectType) - role2ID = role2IDs and role2IDs[0] - - rItems = rItemsMan.ZApp_getItems(objectID=object1.getPrimaryKeyValue(), objectManager=object1.Manager, roleID=role1ID) - - self.removeObjectRelations( rItems = rItems, role1ID = role1ID, role2ID = role2ID, o2Type = o2Type, o2Manager = o2Manager) def removeObjectRelations(self, rItemIDs=None, rItems=None, role1ID='', role2ID='', o2Type='', o2Manager=''): --- 31,34 ---- *************** *** 91,125 **** """ - rItemsMan = self.getRelationshipItemManager() - - if not rItems: - if not rItemIDs: - raise RuntimeError, "remove object relations needs either items or itemIDs.. " - - rItems = rItemsMan.ZApp_getItems( relationshipItemID = rItemIDs ) - - for rItem1 in rItems: - theRID=rItem1.relationshipID - for rItem2 in rItemsMan.ZApp_getItems(relationshipID=theRID, objectManager=o2Manager, roleID=role2ID): - if rItem2.id != rItem1.id: - if o2Type: - theObject = rItem2.getObject() - if theObject: - if theObject.objectType != o2Type: - continue - - rItem2.manage_delete() - - rItem1.manage_delete() - self.commit_subtransaction() - - rItemsLeft = rItemsMan.ZApp_getItems(relationshipID=theRID) - if len(rItemsLeft) < 2: - for ri in rItemsLeft: - ri.manage_delete() - - relation = self.getItem(theRID) - if relation: - relation.manage_delete() def getObjectRelations(self, anObject, objectTypes=None, objectRoles=None, selfRoles=None, returnObjects=0): --- 37,40 ---- *************** *** 148,205 **** """ - rItemsMan = self.getRelationshipItemManager() - - myRelationshipItems = rItemsMan.ZApp_getItems( objectID=anObject.getPrimaryKeyValue(), objectManager=anObject.Manager) - riMan = self.getRoleManager() - - results = [] - - for anRI in myRelationshipItems: - selfRIID= anRI.id - selfRIRole = anRI.roleID and riMan.getItem(anRI.roleID) - selfRIRoleName = (selfRIRole or '') and selfRIRole.name - if selfRoles and (selfRIRoleName not in selfRoles): - continue - - theRelationshipItems = rItemsMan.ZApp_getItems( relationshipID=anRI.relationshipID ) - - for rItem in theRelationshipItems: - if rItem.id == selfRIID: - continue # reject my own RI... - - RIID = rItem.id - RIRole = rItem.roleID and riMan.getItem(rItem.roleID) - RIRoleName = (RIRole or '') and RIRole.name - if objectRoles: - if not RIRole: - continue - elif RIRoleName not in objectRoles: - continue - - theResult = {} - - if objectTypes or returnObjects: - theObject = rItem.getObject() - if objectTypes and theObject and (theObject.objectType not in objectTypes): - continue - if returnObjects: - theResult['otherObject'] = theObject - - theResult.update({ - 'relationshipID':rItem.relationshipID, - 'otherRIID':RIID, - 'otherObjectID':rItem.objectID, - 'otherManagerID':rItem.objectManager, - 'otherRole':RIRoleName, - 'otherContextID':rItem.contextID, - 'selfRole':selfRIRoleName, - 'selfRIID':selfRIID, - 'selfContextID':anRI.contextID, - }) - - results.append( theResult ) - - return results - def getRelatedObjects(self, anObject, objectTypes=None, objectRoles=None, selfRoles=None): --- 63,66 ---- *************** *** 208,216 **** """ - results = self.getObjectRelations( anObject, objectTypes=objectTypes, objectRoles=objectRoles, selfRoles=selfRoles, returnObjects=1) - - return [x['otherObject'] for x in results] - - def getRelatedObjectContextIDs(self, anObject, objectTypes=None, objectRoles=None, selfRoles=None, returnTuple=0): """ --- 69,72 ---- *************** *** 218,252 **** """ - myRelationshipItems = self.getRelationshipItemManager().ZApp_getItems( objectID=anObject.getPrimaryKeyValue(), objectManager=anObject.Manager) - riMan = self.getRoleManager() - - results = [] - - for anRI in myRelationshipItems: - if selfRoles: - RIRole = riMan.getItem(anRI.roleID) - if (not RIRole) or (RIRole.name not in selfRoles): - continue - - theRelationshipItems = self.getRelationshipItemManager().ZApp_getItems( relationshipID=anRI.relationshipID ) - for rItem in theRelationshipItems: - if objectRoles: - RIRole = riMan.getItem(rItem.roleID) - if not RIRole: - continue - elif RIRole.name not in objectRoles: - continue - - if (not ((rItem.objectManager == anObject.Manager) and (rItem.objectID == anObject.getPrimaryKeyValue()))): - if objectTypes and (theObject.objectType not in objectTypes): - continue - results.append((rItem.getSortableContextID(), rItem.contextID)) # build a sortable list... - - results.sort() - - if not returnTuple: - results = map(lambda x:x[1], results) # grab the actual context id... - - return results def nextContextID(self, anObject, objectTypes=None, objectRoles=None, selfRoles=None): --- 74,77 ---- *************** *** 255,274 **** """ - contextIDs = self.getRelatedObjectContextIDs( anObject, objectTypes=objectTypes, objectRoles=objectRoles, selfRoles=selfRoles, returnTuple=1) - - maxVal = contextIDs and contextIDs[-1][0] - - iVal = 1 - if maxVal: - try: - iVal = string.atoi(maxVal) + 1 - except ValueError: - try: - iVal = chr(ord(maxVal) + 1) - except ValueError: - pass - else: - pass - - return iVal - --- 80,81 ---- Index: ZApp_MiscData.py =================================================================== RCS file: /cvsroot/zapp/ZApp/help/ZApp_MiscData.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ZApp_MiscData.py 5 Feb 2004 17:27:32 -0000 1.1 --- ZApp_MiscData.py 23 May 2004 21:42:14 -0000 1.2 *************** *** 9,55 **** """get XML dictionary based on database xml rep... """ - self._v_Keeper # make sure we flush at transaction boundaries.. - - if self.xml: - try: - theTuple, methodName = loads(self.xml) - theDict = theTuple and theTuple[0] - except: - theDict = {'xmlParserError!':'bad xml?'} - else: - theDict = {} - - v = self._v_xmlDict = theDict - - return v - def buildXML(self, commit_now=1): """ create the XML to represent this object.""" - self.xml = dumps( (self._v_xmlDict,)) - - if commit_now: - get_transaction().commit(1) - - return self.xml def getXMLAttr(self, attr, default=None): """ get an XML based attribute.""" ! value = self._v_xmlDict.get(attr, default) ! return value ! def getXMLDict(self): """ return the XML dictionary.. """ - result = {} - result.update( self._v_xmlDict ) - return result def XMLAttrs(self): """ get my XML based attribute names.. """ - return self._v_xmlDict.keys() def setXMLAttr(self, attr, value): """ set an XML attribute to a value.""" - self._setXMLAttr( attr, value) - self.buildXML() def setXMLAttrs(self, dict=None, zapp_misc_data_clear=0, **kw): --- 9,26 ---- """get XML dictionary based on database xml rep... """ def buildXML(self, commit_now=1): """ create the XML to represent this object.""" def getXMLAttr(self, attr, default=None): """ get an XML based attribute.""" ! def getXMLDict(self): """ return the XML dictionary.. """ def XMLAttrs(self): """ get my XML based attribute names.. """ def setXMLAttr(self, attr, value): """ set an XML attribute to a value.""" def setXMLAttrs(self, dict=None, zapp_misc_data_clear=0, **kw): *************** *** 60,79 **** """ - saveDict = {} - - saveDict.update(kw) - - if dict: - saveDict.update(dict) - - if zapp_misc_data_clear: - self._clearXMLAttrs() - - d = self._v_xmlDict # getting _v_xmlDict insures the cache is setup - - for k in saveDict.keys(): - self._setXMLAttr(k, saveDict[k], d) - - self.buildXML() def storeInXML(self, obj, attr_list): --- 31,34 ---- *************** *** 82,93 **** """ - storeDict = {} - - for key in attr_list: - val = getattr(obj, key, missing) - if val is not missing: - storeDict[key] = val - - self.setXMLAttrs( storeDict ) class ZApp_MiscDataUser: --- 37,40 ---- *************** *** 103,123 **** """ - Manager = (Manager or '') or self.miscDataManager - localmdmKey = Manager + ":" + dataType - mdm = self._v_MyMDMCache.get(localmdmKey, missing) - mdResult = None - - if mdm is missing: - mds = self.getMiscDataSpecialist() - for aBag in mds.ZApp_getItems( objectID = self.getMiscObjectID(), Manager = Manager): - if aBag.dataType == dataType: - mdResult = aBag - break - - if createIfNone and (mdResult is None): - mdResult = self.setupMiscData( Manager, dataType, checked=1) - - return mdResult or None - def setupMiscData(self, Manager=None, dataType='', checked=0): """ --- 50,53 ---- *************** *** 125,149 **** then calling with 'checked=1' will avoid a search. """ - mdm = None - Manager = Manager or self.miscDataManager - - if not checked: - mdm = self.getMiscData( Manager=Manager, dataType=dataType ) - - if not mdm: - localmdmKey = Manager + ":" + dataType - md = self.getMiscDataSpecialist() - mdm = md.ZApp_createNewItem( objectID = self.getMiscObjectID(), Manager = Manager, dataType=dataType ) - self._v_MyMDMCache[localmdmKey] = mdm - - return mdm def getMiscObjectID(self): """ compute object for MiscData.. """ - if getattr(self, '_primaryKeyGenerator',None): - result = eval(self._primaryKeyGenerator) - else: - result = self.id - return result def getDataPropertyManagers(self, withID=''): --- 55,61 ---- *************** *** 151,168 **** return a list of propertyManagers in my 'miscDataDef' class extender.. """ - - result = [] - myDM = self._v_dm_ - for provider in getattr(myDM,myDM.DataPlugins.attr): - if provider.meta_type == 'DataSkin Class Extender': - if withID: - thePropManager = getattr(provider, withID, None) - if thePropManager: - result = [thePropManager] - break - else: - thePropManagers = filter(lambda x,ha=hasattr: ha(x,'propertyMap'), provider.objectValues()) - result += thePropManagers - return result def applyTypeConverter(self, typeCode, value, args=None): --- 63,66 ---- *************** *** 170,190 **** apply a type converter/formatter to a value.. """ - result = value - if typeCode: - converter = self.decodeTypeConverters.get( typeCode, missing) - if converter: - value = [value] - if type(converter) == StringType: - converter = getattr(self, converter, missing) - - if args: - value = value + args - - result = apply(converter, tuple(value)) - - if type(result) != StringType: - result = `result` - - return result --- 68,71 ---- *************** *** 201,236 **** """ - attrList = getattr(self, miscNameAttr, missing) - - if attrList is missing: - return "No Attributes for '%s'." % miscNameAttr - - xmlDict = {} - mdobj = self.getMiscData(dataType=dataType) - if mdobj: - xmlDict = mdobj.getXMLDict() - - for attr_and_type in attrList: - attr_type_list = attr_and_type.split(':') - attr = attr_type_list[0] - if dataDict.has_key(attr): - typecode = '' - if len(attr_type_list) > 2: - typecodeList = attr_type_list[2].split('/') - typecode = typecodeList[0] - if len(typecodeList) > 1: - args = map(lambda x,ca=checkArg: ca(x), typecodeList[1:]) - - value = dataDict.get(attr,missing) - if value is not missing: - if typecode: - value = self.applyTypeConverter(typecode, value, args) - xmlDict[attr] = value - - if not mdobj: - mdobj = self.setupMiscData(dataType = dataType) - - mdobj.setXMLAttrs( xmlDict ) - return xmlDict def getMiscDataFor(self, miscNameAttr=DEFAULT_MISCNAMEATTR, dataType=''): --- 82,85 ---- *************** *** 246,279 **** """ - attrList = getattr(self, miscNameAttr, missing) - if attrList is missing: - return {} - - mdobj = self.getMiscData(dataType=dataType) - if not mdobj: - return {} - - result = {} - - for attr_and_type in attrList: - attr_type_list = attr_and_type.split(':') - attr = attr_type_list[0] - typecode = '' - args = None - if len(attr_type_list) != 1: - typecodeList = attr_type_list[1].split('/') - typecode = typecodeList[0] - if len(typecodeList) != 1: - args = map(lambda x,ca=checkArg: ca(x), typecodeList[1:]) - - value = mdobj.getXMLAttr(attr) - - if typecode: - value = self.applyTypeConverter(typecode, value, args) - - if value is not None: - result[attr] = value - - return result def getObjectInfo(self, miscNameAttr=DEFAULT_MISCNAMEATTR): --- 95,98 ---- *************** *** 282,304 **** """ - result = {'objectID':self.getId()} - - if miscNameAttr==DEFAULT_MISCNAMEATTR: - for p in self._properties: - if p['id']: - val = getattr(self, p['id']) - if p['type'] == 'date': - val = (hasattr(val,'ISO') and val.ISO()) or `val` - elif p['type'] != 'string': - if val: - val = `val` - elif val is None: - val = '' - - result[p['id']] = val - - result.update( self.getMiscDataFor( miscNameAttr )) - - return result --- 101,104 ---- Index: ZApp_CMFBase.py =================================================================== RCS file: /cvsroot/zapp/ZApp/help/ZApp_CMFBase.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ZApp_CMFBase.py 5 Feb 2004 17:27:32 -0000 1.1 --- ZApp_CMFBase.py 23 May 2004 21:42:14 -0000 1.2 *************** *** 12,21 **** Set miscellaneous data for this object.. """ - currDict = {} - currDict.update(kw) - currDict.update(dataDict) - miscData = self.getMiscData( dataType=dataType, createIfNone=1) - miscData.setXMLAttrs( currDict ) - - return "OK!" - --- 12,13 ---- |
|
From: Steve S. <ssp...@us...> - 2004-05-14 15:59:18
|
Update of /cvsroot/zapp/ZAppUser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30382 Modified Files: ZU_User.py Log Message: make LM/ZAppUser work with GRUF/Plone Index: ZU_User.py =================================================================== RCS file: /cvsroot/zapp/ZAppUser/ZU_User.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ZU_User.py 7 Mar 2003 11:03:32 -0000 1.3 --- ZU_User.py 14 May 2004 15:59:08 -0000 1.4 *************** *** 90,94 **** self.ZU_setPassword(password, scheme=None) - security.declareProtected('Manager','checkPassword') def checkPassword(self, aPassword, helperFunction=None): """ --- 90,93 ---- |
|
From: Steve S. <ssp...@us...> - 2004-05-14 15:59:17
|
Update of /cvsroot/zapp/ZAppUser/Extensions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30382/Extensions Added Files: addUser.py changeUser.py deleteUsers.py Log Message: make LM/ZAppUser work with GRUF/Plone --- NEW FILE: deleteUsers.py --- def deleteUsers(self, ids): if type(ids) is type(''): ids=[ids] for id in ids: user = self.getItem( id ) if user: user.manage_delete() for id in ids: user = self.users.getItem( id ) if user: user.manage_delete() self.users.commit_subtransaction() return 'OK!' --- NEW FILE: changeUser.py --- ## Script (Python) "changeUser" ##bind container=container def changeUser(self, username, password, roles, domains): user = self.users.getItem(username) if user: if password is not None: user.change(myPassword=password, myRoles=' '.join(roles), myDomains=' '.join(domains)) else: user.change(myRoles=' '.join(roles), myDomains=' '.join(domains)) user = self.getItem(username) if user: user.credentialsChanged(None) self.users.commit_subtransaction() return 'OK!' --- NEW FILE: addUser.py --- def addUser(self, name, password, roles, domains): self.users.ZApp_createNewItem(id=name, myPassword=password, myRoles=' '.join(roles), myDomains=' '.join(domains)) self.users.commit_subtransaction() return 'OK!' |
|
From: Steve S. <ssp...@us...> - 2004-05-14 15:58:42
|
Update of /cvsroot/zapp/ZAppUser/Extensions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30172/Extensions Log Message: Directory /cvsroot/zapp/ZAppUser/Extensions added to the repository |
|
From: Steve S. <ssp...@us...> - 2004-04-05 03:43:27
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15752 Modified Files: ZApp_CMFBase.py Log Message: moved position of Dublin Core tab Index: ZApp_CMFBase.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** ZApp_CMFBase.py 31 Mar 2004 17:33:26 -0000 1.48 --- ZApp_CMFBase.py 5 Apr 2004 03:30:53 -0000 1.49 *************** *** 70,80 **** ) ! ! manage_options = ( ! { 'label' : 'Dublin Core' ! , 'action' : 'manage_metadata' ! } ! ,) \ ! + SkinnedFolder.manage_options class_default_for_copyable = 0 # make these guys default to 'not copyable' --- 70,74 ---- ) ! manage_options = SkinnedFolder.manage_options + ({ 'label' : 'Dublin Core' , 'action' : 'manage_metadata'},) class_default_for_copyable = 0 # make these guys default to 'not copyable' |
|
From: Steve S. <ssp...@us...> - 2004-04-04 22:47:10
|
Update of /cvsroot/zapp/ZApp/skins/zapp_generic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1101 Modified Files: zapp_show_mov.pt Log Message: have movie display use new zapp_cmf_file features... Index: zapp_show_mov.pt =================================================================== RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_show_mov.pt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** zapp_show_mov.pt 2 Apr 2004 14:26:59 -0000 1.1 --- zapp_show_mov.pt 4 Apr 2004 22:34:37 -0000 1.2 *************** *** 1,5 **** <div metal:define-macro="main"> <tal:block tal:omit-tag="" define="main_name python:'.'.join(path('here/getId').split('.')[:-1]); ! mov_url here/graphic_url"> <OBJECT CLASSID="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" WIDTH="480" HEIGHT="300" CODEBASE="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"> <PARAM NAME="type" VALUE="video/quicktime"> --- 1,5 ---- <div metal:define-macro="main"> <tal:block tal:omit-tag="" define="main_name python:'.'.join(path('here/getId').split('.')[:-1]); ! mov_url here/absolute_url"> <OBJECT CLASSID="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" WIDTH="480" HEIGHT="300" CODEBASE="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"> <PARAM NAME="type" VALUE="video/quicktime"> *************** *** 15,17 **** BORDER="0" PLUGINSPAGE="http://www.apple.com/quicktim e/download/indext.html"></EMBED></OBJECT></tal:block> ! </div> --- 15,17 ---- BORDER="0" PLUGINSPAGE="http://www.apple.com/quicktim e/download/indext.html"></EMBED></OBJECT></tal:block> ! </div> \ No newline at end of file |
|
From: Steve S. <ssp...@us...> - 2004-04-04 21:59:42
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24122 Modified Files: __init__.py Added Files: ZApp_DocMPatch.py Log Message: provide doc monkeypatch to fix cr/lf issues.. --- NEW FILE: ZApp_DocMPatch.py --- """ ZApp monkeypatch for Document... """ from Products.CMFDefault.Document import Document old_manage_FTPget = Document.manage_FTPget def new_manage_FTPget(self): """ delegate... but fix up! """ result = old_manage_FTPget(self) if type(result) == type(''): result = '\r\n'.join(result.splitlines()) return result Document.manage_FTPget = new_manage_FTPget Index: __init__.py =================================================================== RCS file: /cvsroot/zapp/ZApp/__init__.py,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** __init__.py 30 Mar 2004 17:06:26 -0000 1.26 --- __init__.py 4 Apr 2004 21:47:10 -0000 1.27 *************** *** 3,6 **** --- 3,12 ---- # + enableXMLRPC_monkeypatch=1 + enableCMFDocument_monkeypatch=1 + + if enableXMLRPC_monkeypatch: + import xmlrpc_mp + import ZApp_Base import ZApp_Specialist *************** *** 25,28 **** --- 31,38 ---- try: import ZApp_CMFBase + + if enableCMFDocument_monkeypatch: + import ZApp_DocMPatch + from Products.CMFCore import utils from Products.CMFCore.CMFCorePermissions import View, ModifyPortalContent, AddPortalContent, FTPAccess *************** *** 40,45 **** allow_module('Products.ZApp.ZApp_Utils') - import xmlrpc_mp - def initialize(context, debug=None): --- 50,53 ---- *************** *** 60,64 **** utils.ContentInit( 'ZApp CMF Content', ! content_types = (ZApp_CMFBase.ZApp_CMFBase, ZApp_CMFBase.ZApp_CMF_FSImage, ZApp_CMFBase.ZApp_CMF_ZODBImage, ZApp_CMFBase.ZApp_CMF_FSFolder), permission = AddPortalContent, extra_constructors = (ZApp_CMFBase.addZAppCMFObject, ZApp_CMFBase.addZAppCMFFSImage, ZApp_CMFBase.addZAppCMFZODBImage, ZApp_CMFBase.addZAppCMFFSFolder), --- 68,72 ---- utils.ContentInit( 'ZApp CMF Content', ! content_types = (ZApp_CMFBase.ZApp_CMFBase, ZApp_CMFBase.ZApp_CMF_FSImage, ZApp_CMFBase.ZApp_CMF_ZODBImage, ZApp_CMFBase.ZApp_CMF_FSFolder,), permission = AddPortalContent, extra_constructors = (ZApp_CMFBase.addZAppCMFObject, ZApp_CMFBase.addZAppCMFFSImage, ZApp_CMFBase.addZAppCMFZODBImage, ZApp_CMFBase.addZAppCMFFSFolder), |
