From 7268d3236dc1ea69c8ff786e43ea77939c6d1a97 Mon Sep 17 00:00:00 2001 From: Eric Price Date: Tue, 9 Oct 2007 22:19:05 -0400 Subject: [PATCH] No longer force user_ at start of machine name on machine creation. Modify already doesn't enforce this. People seem to prefer this convention, and we used transactions to create and modify machines, so we don't think there are likely to be problems. It should result in nicer hostnames. (tabbott ghosting as ecprice again) svn path=/trunk/web/; revision=162 --- templates/list.tmpl | 2 +- templates/main.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/list.tmpl b/templates/list.tmpl index a27fe0b..e300f61 100644 --- a/templates/list.tmpl +++ b/templates/list.tmpl @@ -71,7 +71,7 @@ $has_vnc[$machine] - + diff --git a/templates/main.py b/templates/main.py index e5dae26..36ea239 100755 --- a/templates/main.py +++ b/templates/main.py @@ -353,7 +353,7 @@ def create(user, fields): name = fields.getfirst('name') if not validMachineName(name): raise InvalidInput('name', name) - name = user.username + '_' + name.lower() + name = name.lower() if Machine.get_by(name=name): raise InvalidInput('name', name, -- 1.7.9.5
Name${user.username}_
Memory