From 0ad447aeae0fd400dfd849aca41e6edf87cf7ffc Mon Sep 17 00:00:00 2001 From: Joey Hagedorn Date: Wed, 6 Jun 2007 14:50:20 +0000 Subject: bugfix to updated statistics retention policy git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3248 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Reports/reports/views.py | 7 +++++++ src/lib/Server/Reports/settings.py | 1 + src/lib/Server/Reports/urls.py | 2 ++ 3 files changed, 10 insertions(+) (limited to 'src/lib/Server/Reports') diff --git a/src/lib/Server/Reports/reports/views.py b/src/lib/Server/Reports/reports/views.py index 5ddfa6533..758c07249 100644 --- a/src/lib/Server/Reports/reports/views.py +++ b/src/lib/Server/Reports/reports/views.py @@ -172,6 +172,13 @@ def client_detail(request, hostname = None, pk = None): interaction = client.interactions.get(pk=pk)#can this be a get object or 404? return render_to_response('clients/detail.html', {'client': client, 'interaction': interaction}) +def client_manage(request, hostname = None): + #SETUP error pages for when you specify a client or interaction that doesn't exist + client = get_object_or_404(Client, name=hostname) + #if post data has a ?disable=DATE, set it for the client in the DB (model!) +save + interaction = client.current_interaction + return render_to_response('clients/manage.html', {'client': client, 'interaction': interaction}) + def display_sys_view(request, timestamp = 'now'): client_lists = prepare_client_lists(request, timestamp) return render_to_response('displays/sys_view.html', client_lists) diff --git a/src/lib/Server/Reports/settings.py b/src/lib/Server/Reports/settings.py index df781c890..f55696e27 100644 --- a/src/lib/Server/Reports/settings.py +++ b/src/lib/Server/Reports/settings.py @@ -59,6 +59,7 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.middleware.doc.XViewMiddleware', + 'django.middleware.profile.ProfileMiddleware', ) ROOT_URLCONF = 'Bcfg2.Server.Reports.urls' diff --git a/src/lib/Server/Reports/urls.py b/src/lib/Server/Reports/urls.py index 6d5fe8833..9f602cb4d 100644 --- a/src/lib/Server/Reports/urls.py +++ b/src/lib/Server/Reports/urls.py @@ -4,7 +4,9 @@ urlpatterns = patterns('', # Example: # (r'^Bcfg2.Server.Reports/', include('Bcfg2.Server.Reports.apps.foo.urls.foo')), (r'^/*$','Bcfg2.Server.Reports.reports.views.index'), + (r'^clients/(?P\S+)/(?P\d+)/$', 'Bcfg2.Server.Reports.reports.views.client_detail'), + (r'^clients/(?P\S+)/manage/$', 'Bcfg2.Server.Reports.reports.views.client_manage'), (r'^clients/(?P\S+)/$', 'Bcfg2.Server.Reports.reports.views.client_detail'), (r'^clients/(?P\S+)$', 'Bcfg2.Server.Reports.reports.views.client_detail'), #hack because hostnames have periods and we still want to append slash -- cgit v1.2.3-1-g7c22