diff options
Diffstat (limited to 'src/lib/Server/Hostbase/hostbase')
-rw-r--r-- | src/lib/Server/Hostbase/hostbase/models.py | 1 | ||||
-rw-r--r-- | src/lib/Server/Hostbase/hostbase/views.py | 5 | ||||
-rw-r--r-- | src/lib/Server/Hostbase/hostbase/webtemplates/host.html | 50 | ||||
-rw-r--r-- | src/lib/Server/Hostbase/hostbase/webtemplates/results.html | 22 |
4 files changed, 39 insertions, 39 deletions
diff --git a/src/lib/Server/Hostbase/hostbase/models.py b/src/lib/Server/Hostbase/hostbase/models.py index 92bbb4b00..7c47b65bd 100644 --- a/src/lib/Server/Hostbase/hostbase/models.py +++ b/src/lib/Server/Hostbase/hostbase/models.py @@ -54,6 +54,7 @@ class Host(models.Model): expiration_date = models.DateField(null=True, blank=True) last = models.DateField(auto_now=True, auto_now_add=True) status = models.CharField(maxlength=7, choices=STATUS_CHOICES) + dirty = models.BooleanField() class Admin: list_display = ('hostname', 'last') diff --git a/src/lib/Server/Hostbase/hostbase/views.py b/src/lib/Server/Hostbase/hostbase/views.py index 299cc5829..c3b850442 100644 --- a/src/lib/Server/Hostbase/hostbase/views.py +++ b/src/lib/Server/Hostbase/hostbase/views.py @@ -10,6 +10,7 @@ from hostbase.models import * from Cheetah.Template import Template from datetime import date from django.db import connection +from django.shortcuts import render_to_response import re templatedir = '/usr/lib/python2.3/site-packages/Hostbase/hostbase/webtemplates' @@ -90,9 +91,7 @@ def search(request): cursor.execute(querystring) results = cursor.fetchall() - temp = Template(open('%s/results.html' % templatedir).read()) - temp.hosts = results - return HttpResponse(str(temp)) + return render_to_response('%s/results.html' % templatedir, {'hosts': results}) else: temp = Template(open('%s/search.html' % templatedir).read()) temp.TYPE_CHOICES = Interface.TYPE_CHOICES diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html index 43baa14c6..937d0115d 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html @@ -100,49 +100,49 @@ <tr> <td> <b>printq</b></td> <td> $host.printq</td></tr> <tr> <td> <b>dhcp</b></td> - #if $host.dhcp + {% if host.dhcp %} <td> y </td></tr> - #else + {% else %} <td> n </td></tr> - #end if + {% endif %} <tr> <td> <b>outbound_smtp</b></td> - #if $host.outbound_smtp + {% if host.outbound_smtp %} <td> y </td></tr> - #else + {% else %} <td> n </td></tr> - #end if + {% endif %} <tr> <td> <b>primary_user</b></td> - <td> $host.primary_user</td></tr> + <td> {{ host.primary_user }}</td></tr> <tr> <td> <b>administrator</b></td> - <td> $host.administrator</td></tr> + <td> {{ host.administrator }}</td></tr> <tr> <td> <b>location</b></td> - <td> $host.location</td></tr> + <td> {{ host.location }}</td></tr> <tr> <td> <b>expiration_date</b></td> - <td> $host.expiration_date</td></tr> - #for $interface in $interfaces + <td> {{ host.expiration_date }}</td></tr> + {% for interface in interfaces %} <tr> <td><br><b>Interface</b></td> - #if $interface.hdwr_type != 'no' - <td><br>$interface.hdwr_type </td></tr> - #end if + {% ifnotequal interface.hdwr_type 'no' %} + <td><br>{{ interface.hdwr_type }}</td></tr> + {% endif %} <tr> <td> <b>mac_addr</b></td> - <td> $interface.mac_addr </b></td></tr> - #for $ip in $ips[$interface.id] + <td> {{ interface.mac_addr }}</b></td></tr> + {% for ip in ips.{{ interface.id }} %} <tr> <td> <b>ip_addr</b></td> - <td> $ip.ip_addr</td></tr> - #end for - #end for + <td> {{ ip.ip_addr }}</td></tr> + {% endfor %} + {% endfor %} <tr> <td valign="top"> <b>comments</b></td> <td> - #for $line in $host.comments.split("\n") - $line<br> - #end for + {% for line in host.comments.split("\n") %} + {{ line }}<br> + {% endfor %} </td></tr> </table> -<a style="font-size:75%" href="/hostbase/$host.id/dns/">see detailed DNS information for this host</a> +<a style="font-size:75%" href="/hostbase/{{ host.id }}/dns/">see detailed DNS information for this host</a> <br><br> -this host is $host.status<br> -last update on $host.last<br> +this host is {{ host.status }}<br> +last update on {{ host.last }}<br> <!-- InstanceEndEditable --></td>
</tr>
</table></td>
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html index 470883e61..1825f6d95 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html +++ b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html @@ -81,7 +81,7 @@ <td nowrap><table width="100%" border="0" cellpadding="5" cellspacing="0">
<tr>
<td><!-- InstanceBeginEditable name="mainFeature" --> -#if $hosts +{% if hosts %} <table border="0" width="100%"> <colgroup> <col width="200"> @@ -91,22 +91,22 @@ <tr> <td><b>hostname</b></td> <td> <b>status</b> </td> </tr> - #for $host in $hosts - <tr> <td> $host[0]</td> - #if $host[2] + {% for host in hosts %} + <tr> <td>{{ host.0 }}</td> + {% if host.2 %} <td> active </td> - #else + {% else %} <td> inactive </td> - #end if - <td> <a href="$host[1]">view</a> </td> - <td> <a href="$host[1]/edit">edit</a> </td> + {% endif %} + <td> <a href="{{ host.1 }}">view</a> </td> + <td> <a href="{{ host.1 }}/edit">edit</a> </td> </tr> - #end for + {% endfor %} </table> -#else +{% else %} No hosts matched your query<br> Click the back button on your browser to edit your search -#end if +{% endif %} <!-- InstanceEndEditable --></td>
</tr>
</table></td>
|