summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorJoey Hagedorn <hagedorn@mcs.anl.gov>2007-06-06 14:59:36 +0000
committerJoey Hagedorn <hagedorn@mcs.anl.gov>2007-06-06 14:59:36 +0000
commitec8b235b87d1cf59f149d42b8032604ce04f3d77 (patch)
treeff07f145a2c53db5900be02c471f6f2e66e6bdb4 /src/lib
parent0ad447aeae0fd400dfd849aca41e6edf87cf7ffc (diff)
downloadbcfg2-ec8b235b87d1cf59f149d42b8032604ce04f3d77.tar.gz
bcfg2-ec8b235b87d1cf59f149d42b8032604ce04f3d77.tar.bz2
bcfg2-ec8b235b87d1cf59f149d42b8032604ce04f3d77.zip
reverting accidentally committed changes from previous revision
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3249 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Server/Reports/reports/views.py7
-rw-r--r--src/lib/Server/Reports/settings.py1
-rw-r--r--src/lib/Server/Reports/urls.py2
3 files changed, 0 insertions, 10 deletions
diff --git a/src/lib/Server/Reports/reports/views.py b/src/lib/Server/Reports/reports/views.py
index 758c07249..5ddfa6533 100644
--- a/src/lib/Server/Reports/reports/views.py
+++ b/src/lib/Server/Reports/reports/views.py
@@ -172,13 +172,6 @@ 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 f55696e27..df781c890 100644
--- a/src/lib/Server/Reports/settings.py
+++ b/src/lib/Server/Reports/settings.py
@@ -59,7 +59,6 @@ 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 9f602cb4d..6d5fe8833 100644
--- a/src/lib/Server/Reports/urls.py
+++ b/src/lib/Server/Reports/urls.py
@@ -4,9 +4,7 @@ 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<hostname>\S+)/(?P<pk>\d+)/$', 'Bcfg2.Server.Reports.reports.views.client_detail'),
- (r'^clients/(?P<hostname>\S+)/manage/$', 'Bcfg2.Server.Reports.reports.views.client_manage'),
(r'^clients/(?P<hostname>\S+)/$', 'Bcfg2.Server.Reports.reports.views.client_detail'),
(r'^clients/(?P<hostname>\S+)$', 'Bcfg2.Server.Reports.reports.views.client_detail'),
#hack because hostnames have periods and we still want to append slash