From ca8a53a3c98f0e124106cdd29792059272c191ee Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 8 Apr 2010 09:02:53 -0500 Subject: Remove whitespace Signed-off-by: Sol Jerome --- src/lib/Server/Hostbase/backends.py | 9 +++---- src/lib/Server/Hostbase/hostbase/models.py | 6 ++--- src/lib/Server/Hostbase/hostbase/views.py | 12 ++++----- .../Hostbase/hostbase/webtemplates/copy.html | 10 ++++---- .../Hostbase/hostbase/webtemplates/dnsedit.html | 2 +- .../Hostbase/hostbase/webtemplates/edit.html | 2 +- .../Hostbase/hostbase/webtemplates/host.html | 4 +-- .../webtemplates/hostbase/host_confirm_delete.html | 4 +-- .../Hostbase/hostbase/webtemplates/index.html | 2 +- .../Hostbase/hostbase/webtemplates/logout.html | 2 +- .../Server/Hostbase/hostbase/webtemplates/new.html | 2 +- .../Hostbase/hostbase/webtemplates/remove.html | 4 +-- .../Hostbase/hostbase/webtemplates/zoneview.html | 4 +-- src/lib/Server/Hostbase/ldapauth.py | 18 ++++++------- src/lib/Server/Hostbase/media/boxypastel.css | 9 ++----- src/lib/Server/Hostbase/settings.py | 5 ++-- src/lib/Server/Hostbase/templates/batchadd.tmpl | 30 +++++++++++----------- src/lib/Server/Hostbase/templates/dhcpd.tmpl | 2 +- src/lib/Server/Hostbase/templates/named.tmpl | 6 ++--- src/lib/Server/Hostbase/templates/namedviews.tmpl | 4 +-- .../Server/Hostbase/test/test_environ_settings.py | 2 +- src/lib/Server/Hostbase/test/test_settings.py | 2 -- 22 files changed, 66 insertions(+), 75 deletions(-) diff --git a/src/lib/Server/Hostbase/backends.py b/src/lib/Server/Hostbase/backends.py index e6c709f35..aa822409c 100644 --- a/src/lib/Server/Hostbase/backends.py +++ b/src/lib/Server/Hostbase/backends.py @@ -8,7 +8,7 @@ __revision__ = '$Revision$' ## def authenticate(self,username=None,password=None): ## try: - + ## l = ldapauth(username,password) ## temp_pass = User.objects.make_random_password(100) ## ldap_user = dict(username=l.sAMAccountName, @@ -25,7 +25,7 @@ __revision__ = '$Revision$' ## #print user ## #print "created " + str(created) ## return user - + ## except LDAPAUTHError,e: ## #print str(e) ## return None @@ -36,7 +36,7 @@ __revision__ = '$Revision$' ## except User.DoesNotExist, e: ## print str(e) ## return None - + class NISBackend(object): @@ -54,7 +54,7 @@ class NISBackend(object): uid = n.uid ) user, created = User.objects.get_or_create(username=username) - + return user except NISAUTHError, e: @@ -66,4 +66,3 @@ class NISBackend(object): return User.objects.get(pk=user_id) except User.DoesNotExist, e: return None - diff --git a/src/lib/Server/Hostbase/hostbase/models.py b/src/lib/Server/Hostbase/hostbase/models.py index 3d72138c4..3f08a09a0 100644 --- a/src/lib/Server/Hostbase/hostbase/models.py +++ b/src/lib/Server/Hostbase/hostbase/models.py @@ -83,7 +83,7 @@ class Interface(models.Model): # FIXME: The new admin interface has change a lot. # radio_admin=True, blank=True) dhcp = models.BooleanField() - + def __str__(self): return self.mac_addr @@ -97,7 +97,7 @@ class IP(models.Model): # edit_inline=models.TABULAR, num_in_admin=1) #ip_addr = models.IPAddressField(core=True) ip_addr = models.IPAddressField() - + def __str__(self): return self.ip_addr @@ -136,7 +136,7 @@ class Name(models.Model): def __str__(self): return self.name - + class Admin: pass diff --git a/src/lib/Server/Hostbase/hostbase/views.py b/src/lib/Server/Hostbase/hostbase/views.py index 9768c69c5..ff1d4710d 100644 --- a/src/lib/Server/Hostbase/hostbase/views.py +++ b/src/lib/Server/Hostbase/hostbase/views.py @@ -16,7 +16,7 @@ from django.shortcuts import render_to_response from django import forms from Bcfg2.Server.Hostbase import settings, regex import re, copy - + attribs = ['hostname', 'whatami', 'netgroup', 'security_class', 'support', 'csi', 'printq', 'primary_user', 'administrator', 'location', 'status', 'comments'] @@ -66,7 +66,7 @@ def search(request): querystring += ' AND ' querystring += "h.%s LIKE \'%%%%%s%%%%\'" % (field, request.POST[field]) _and = True - + if not _and: cursor = connection.cursor() cursor.execute("""SELECT hostname, id, status @@ -77,7 +77,7 @@ def search(request): cursor = connection.cursor() cursor.execute(querystring) results = cursor.fetchall() - + return render_to_response('results.html', {'hosts': results, 'logged_in': request.session.get('_auth_user_id', False)}, @@ -135,7 +135,7 @@ def edit(request, host_id): changename = True interfaces = host.interface_set.all() old_interfaces = [interface.__dict__.copy() for interface in interfaces] - + new_data = request.POST.copy() errors = manipulator.get_validation_errors(new_data) @@ -470,7 +470,7 @@ def dnsedit(request, host_id): mx.save() text = do_log(text, '*new*', 'mx', ' '.join([request.POST['%spriority' % ipaddrstr], request.POST['%smx' % ipaddrstr]])) - name.mxs.add(mx) + name.mxs.add(mx) if text: log = Log(hostname=hostdata['host'].hostname, log=text) log.save() @@ -499,7 +499,7 @@ def dnsedit(request, host_id): 'DNS_CHOICES': Name.DNS_CHOICES, 'logged_in': request.session.get('_auth_user_id', False)}, context_instance = RequestContext(request)) - + def new(request): """Function for creating a new host in hostbase Data is validated before committed to the database""" diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html b/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html index aeb67587f..8ee143b15 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html @@ -30,7 +30,7 @@