From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 18 May 2007 03:31:15 -0000 Subject: [Cluster-devel] conga/luci site/luci/Extensions/LuciZope.py si ... Message-ID: <20070518033115.24764.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 Branch: EXPERIMENTAL Changes by: rmccabe at sourceware.org 2007-05-18 03:31:10 Modified files: luci/site/luci/Extensions: LuciZope.py LuciZopeExternal.py luci/site/luci/var: Data.fs luci/storage : cache_report check-batch index_html mappings_provider validate_html Added files: luci/plone-custom: viewThreadsAtBottom Log message: Make this branch actually run. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/viewThreadsAtBottom.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=NONE&r2=1.1.2.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciZope.py.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.1.2.5&r2=1.1.2.6 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciZopeExternal.py.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.1.2.1&r2=1.1.2.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.25&r2=1.25.2.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/cache_report.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.2&r2=1.2.8.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/check-batch.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.1&r2=1.1.8.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/index_html.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.7&r2=1.7.8.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/mappings_provider.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.4&r2=1.4.8.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/validate_html.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.2.8.1&r2=1.2.8.2 --- conga/luci/site/luci/Extensions/Attic/LuciZope.py 2007/05/16 21:27:21 1.1.2.5 +++ conga/luci/site/luci/Extensions/Attic/LuciZope.py 2007/05/18 03:30:44 1.1.2.6 @@ -40,7 +40,7 @@ if from_cache: return res - allowed_sys_list = allowed_systems(self, None, systems) + allowed_sys_list = allowed_systems(self, systems) ss_list = get_system_info(self, allowed_sys_list) session.set(CACHED_INDEX, ss_list) return ss_list --- conga/luci/site/luci/Extensions/Attic/LuciZopeExternal.py 2007/05/18 02:36:59 1.1.2.1 +++ conga/luci/site/luci/Extensions/Attic/LuciZopeExternal.py 2007/05/18 03:30:44 1.1.2.2 @@ -5,7 +5,8 @@ # GNU General Public License as published by the # Free Software Foundation. -from homebase_adapters import getUserPerms +from homebase_adapters import getUserPerms, homebaseControl, \ + getDefaultUser from cluster_adapters import addResource, clusterTaskProcess, \ createCluChooser, createCluConfigTree, delResource, delService, \ @@ -22,10 +23,11 @@ getServiceInfo, getServicesInfo, getVMInfo from LuciDB import access_to_host_allowed, allowed_systems, \ - check_clusters, getRicciAgent, getSystems, getClusters + check_clusters, getRicciAgent, getSystems, getClusters, \ + getStorage from LuciZope import appendModel, bytes_to_value_prefunits, \ - set_persistent_var, strFilter + set_persistent_var, strFilter, getTabs, siteIsSetup from LuciZopePerm import isAdmin, userAuthenticated @@ -37,6 +39,7 @@ from StorageReport import apply, cache_storage_report, \ get_bd_data, get_mapper_data, get_mappers_data, get_mapper_template_data, \ get_mappings_info, get_storage_batch_result, get_storage_report, \ - group_systems_by_cluster, is_storage_report_cached, validate + group_systems_by_cluster, is_storage_report_cached, validate, \ + get_content_data from system_adapters import get_sys_svc_list, validate_manage_svc Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs 2007/03/20 17:13:45 1.25 and /cvs/cluster/conga/luci/site/luci/var/Data.fs 2007/05/18 03:30:44 1.25.2.1 differ rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed --- conga/luci/storage/cache_report 2006/10/05 23:21:40 1.2 +++ conga/luci/storage/cache_report 2007/05/18 03:31:09 1.2.8.1 @@ -1,7 +1,7 @@ --- conga/luci/storage/index_html 2006/10/09 17:12:28 1.7 +++ conga/luci/storage/index_html 2007/05/18 03:31:09 1.7.8.1 @@ -171,7 +171,7 @@