From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 11 Jul 2006 17:15:05 -0000 Subject: [Cluster-devel] conga/luci python/Products/ManagedSystem/confi ... Message-ID: <20060711171505.8360.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Changes by: rmccabe at sourceware.org 2006-07-11 17:15:04 Modified files: luci/python/Products/ManagedSystem: config.py luci/site/luci/Products/ManagedSystem: config.py luci/site/luci/etc: zope.conf Log message: fix more breakage caused by fc6 upgrade to zope2.9 and plone2.5 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/python/Products/ManagedSystem/config.py.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Products/ManagedSystem/config.py.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/etc/zope.conf.diff?cvsroot=cluster&r1=1.4&r2=1.5 --- conga/luci/python/Products/ManagedSystem/config.py 2006/04/03 15:05:16 1.1 +++ conga/luci/python/Products/ManagedSystem/config.py 2006/07/11 17:15:03 1.2 @@ -1,9 +1,8 @@ -from Products.CMFCore import CMFCorePermissions - -add_permission = CMFCorePermissions.AddPortalContent -edit_permission = CMFCorePermissions.ModifyPortalContent -view_permission = CMFCorePermissions.View +from Products.CMFCore import permissions +add_permission = permissions.AddPortalContent +edit_permission = permissions.ModifyPortalContent +view_permission = permissions.View product_name = "ManagedSystem" plone_product_name = "System Address" --- conga/luci/site/luci/Products/ManagedSystem/config.py 2006/05/30 20:17:21 1.1 +++ conga/luci/site/luci/Products/ManagedSystem/config.py 2006/07/11 17:15:04 1.2 @@ -1,9 +1,8 @@ -from Products.CMFCore import CMFCorePermissions - -add_permission = CMFCorePermissions.AddPortalContent -edit_permission = CMFCorePermissions.ModifyPortalContent -view_permission = CMFCorePermissions.View +from Products.CMFCore import permissions +add_permission = permissions.AddPortalContent +edit_permission = permissions.ModifyPortalContent +view_permission = permissions.View product_name = "ManagedSystem" plone_product_name = "System Address" --- conga/luci/site/luci/etc/zope.conf 2006/06/14 20:59:37 1.4 +++ conga/luci/site/luci/etc/zope.conf 2006/07/11 17:15:04 1.5 @@ -91,7 +91,9 @@ # Example: # # products /home/chrism/projects/myproducts - +products $INSTANCE/Products +products /usr/lib64/zope/lib/python/Products +products /usr/lib64/zope/lib64/python/Products # Directive: environment #