diff options
Diffstat (limited to 'src/lib/Server/Hostbase/hostbase')
12 files changed, 27 insertions, 27 deletions
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 @@ <option value="{{ choice.0 }}" selected="selected" >{{ choice.1 }} {% else %} <option value="{{ choice.0 }}">{{ choice.1 }} - {% endifequal %} + {% endifequal %} {% endfor %} </select> </td></tr> @@ -42,19 +42,19 @@ <option value="{{ choice.0 }}" selected="selected" >{{ choice.1 }} {% else %} <option value="{{ choice.0 }}">{{ choice.1 }} - {% endifequal %} + {% endifequal %} {% endfor %} </select> </td></tr> <tr> <td> <b>class</b></td> <td> - <select name="security_class"> + <select name="security_class"> {% for choice in CLASS_CHOICES %} {% ifequal host.security_class choice.0 %} <option value="{{ choice.0 }}" selected="selected" >{{ choice.1 }} {% else %} <option value="{{ choice.0 }}">{{ choice.1 }} - {% endifequal %} + {% endifequal %} {% endfor %} </select></td></tr> <tr> <td> <b>support</b></td> @@ -65,7 +65,7 @@ <option value="{{ choice.0 }}" selected="selected" >{{ choice.1 }} {% else %} <option value="{{ choice.0 }}">{{ choice.1 }} - {% endifequal %} + {% endifequal %} {% endfor %} </select></td></tr> <tr> <td> <b>csi</b></td> diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html index 9a673cbf0..2b10e5221 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html @@ -75,7 +75,7 @@ {% endfor %} <tr> <td> <b>name</b></td> <td> <input name="{{ ip.0.ip_addr }}name" type="text"> - <select name="{{ ip.0.ip_addr }}dns_view"> + <select name="{{ ip.0.ip_addr }}dns_view"> {% for choice in DNS_CHOICES %} <option value="{{ choice.0 }}">{{ choice.1 }} {% endfor %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html index 8df833821..37cd3e515 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html @@ -173,7 +173,7 @@ div#interface{ <textarea rows="10" cols="50" name="comments">{{ host.comments }}</textarea><br> <a style="font-size:75%" href="/hostbase/{{ host.id }}/dns/edit">edit detailed DNS information for this host</a> <br> -this host is +this host is <select name="status"> {% for choice in host.STATUS_CHOICES %} {% ifequal host.status choice.0 %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html index 73792e0e0..18054fc9b 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html @@ -25,7 +25,7 @@ <col width="150"> <col width="*"> <tr> <td> <b>hostname</b></td> - <td> {{ host.hostname }}</td></tr> + <td> {{ host.hostname }}</td></tr> <tr> <td> <b>whatami</b></td> <td> {{ host.whatami }}</td></tr> <tr> <td> <b>netgroup</b></td> @@ -67,7 +67,7 @@ {% endfor %} {% endfor %} <tr> <td valign="top"> <b>comments</b></td> - <td> + <td> {{ host.comments|linebreaksbr }}<br> </td></tr> diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html b/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html index 230d797c5..3f4c32aa1 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html @@ -24,7 +24,7 @@ <col width="150"> <col width="*"> <tr> <td> <b>hostname</b></td> - <td> {{ object.hostname }}</td></tr> + <td> {{ object.hostname }}</td></tr> <tr> <td> <b>whatami</b></td> <td> {{ object.whatami }}</td></tr> <tr> <td> <b>netgroup</b></td> @@ -70,7 +70,7 @@ {% endfor %} {% endfor %} <tr> <td valign="top"> <b>comments</b></td> - <td> + <td> {{ object.comments|linebreaksbr }}<br> </td></tr> diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/index.html b/src/lib/Server/Hostbase/hostbase/webtemplates/index.html index 1e68de185..92258b648 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/index.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/index.html @@ -13,4 +13,4 @@ {% endblock %} {% block content %} {% endblock %} - + diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/logout.html b/src/lib/Server/Hostbase/hostbase/webtemplates/logout.html index 91dae7e6d..994f631a8 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/logout.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/logout.html @@ -10,4 +10,4 @@ {% endblock %} {% block content %} {% endblock %} - + diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html index 5c74197b4..4b4150ea8 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html @@ -40,7 +40,7 @@ </td></tr> <tr> <td> <b>class</b></td> <td> - <select name="security_class"> + <select name="security_class"> {% for choice in CLASS_CHOICES %} <option value="{{ choice.0 }}">{{ choice.1 }} {% endfor %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html b/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html index 6dfe5aa18..2920a7816 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html @@ -24,7 +24,7 @@ <col width="150"> <col width="*"> <tr> <td> <b>hostname</b></td> - <td> {{ host.hostname }}</td></tr> + <td> {{ host.hostname }}</td></tr> <tr> <td> <b>whatami</b></td> <td> {{ host.whatami }}</td></tr> <tr> <td> <b>netgroup</b></td> @@ -70,7 +70,7 @@ {% endfor %} {% endfor %} <tr> <td valign="top"> <b>comments</b></td> - <td> + <td> {{ host.comments|linebreaksbr }}<br> </td></tr> diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html index 59443c00d..c65735f10 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html @@ -23,7 +23,7 @@ <col width="200"> <col width="*"> <tr> <td> <b>zone</b></td> - <td> {{ zone.zone }}</td></tr> + <td> {{ zone.zone }}</td></tr> <tr> <td> <b>serial</b></td> <td> {{ zone.serial }}</td></tr> <tr> <td> <b>admin</b></td> @@ -61,7 +61,7 @@ {% endif %} <tr> <td valign="top"> <b>aux</b></td> - <td> + <td> {{ zone.aux|linebreaksbr }} </td></tr> |