server/mirrormanager/controllers.py | 5 ++---
server/mirrormanager/templates/adminview.kid | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 74304ee53f8cc47a5bf54205842cf4b0195191f4
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Mon Jan 17 15:34:44 2011 -0600
controllers: minor cleanups
diff --git a/server/mirrormanager/controllers.py b/server/mirrormanager/controllers.py
index 20f11f7..b387a84 100644
--- a/server/mirrormanager/controllers.py
+++ b/server/mirrormanager/controllers.py
@@ -866,7 +866,7 @@ class CategoryFields(widgets.WidgetsList):
canonicalhost = widgets.TextField(validator=validators.UnicodeString,
attrs=dict(size='30'))
topdirPath = widgets.TextField(validator=validators.UnicodeString,
attrs=dict(size='30'))
publiclist = widgets.CheckBox()
- GeoDNSDomain = widgets.TextField(validator=validators.UnicodeString,
attrs=dict(size='30'))
+ GeoDNSDomain = widgets.TextField(label="GeoDNS Domain",
validator=validators.UnicodeString, attrs=dict(size='30'))
category_form = widgets.TableForm(fields=CategoryFields(), submit_text="Create
Category")
@@ -1132,7 +1132,6 @@ class LocationController(SimpleDbObjectController):
# LocationHosts
#########################################################
class LocationHostFields(widgets.WidgetsList):
- locationName = widgets.Label(label="Location Name")
hostid =
widgets.TextField(validator=validators.Int, label="Host ID")
location_host_form = widgets.TableForm(fields=LocationHostFields(),
submit_text="Create Location / Host Mapping")
@@ -1149,7 +1148,7 @@ class LocationHostController(controllers.Controller,
identity.SecureResource, co
raise redirect("/adminview")
submit_action = "/locationhost/create?locationid=%s" % locationid
- return dict(form=location_host_form, values=None, action=submit_action,
page_title="New Location / Host", location=location)
+ return dict(form=location_host_form, values=None, action=submit_action,
page_title="New Location / Host", location=location,
locationName=location.name)
@expose(template="mirrormanager.templates.boringlocationhostform")
@error_handler(new)
commit 96fe95cb487eef45b235a6a49844923929fe3ce9
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Mon Jan 17 15:34:15 2011 -0600
adminview: don't include a link to a Location - it's not linkable
diff --git a/server/mirrormanager/templates/adminview.kid
b/server/mirrormanager/templates/adminview.kid
index f1aa4b3..4f5a506 100644
--- a/server/mirrormanager/templates/adminview.kid
+++ b/server/mirrormanager/templates/adminview.kid
@@ -111,7 +111,7 @@ Nothing to see here, move along.
<div id="Locations">
<h3>Locations <a
href="${tg.url('/location/new')}">[Add]</a></h3>
<ul>
- <li py:for="l in locations"> <a
href="${tg.url('/location/'+str(l.id)+'/')}"><span
py:replace="l.name">Location</span></a>
+ <li py:for="l in locations"><span
py:replace="l.name">Location</span>
<a href="${tg.url('/locationhost/new?locationid=' +
str(l.id))}">[Add Host]</a>
<a href="${tg.url('/location/' + str(l.id) +
'/delete')}">[Delete]</a>