Changeset 228 for trunk/web/templates/main.py

Timestamp:

Oct 28, 2007, 11:57:32 PM (17 years ago)

Author:

ecprice

Message:

Remove the useless User class (now user is a string)
Allow creation under another owner.

File:

• trunk/web/templates/main.py (modified) (6 diffs)

trunk/web/templates/main.py

@@ -47 +47 @@
             '&simple=true" target="_blank" ' + 
             'onclick="return helppopup(\'' + subj + '\')">(?)</a></span>')
-
-class User:
-    """User class (sort of useless, I admit)"""
-    def __init__(self, username, email):
-        self.username = username
-        self.email = email
 
 def makeErrorPre(old, addition):
@@ -134 +128 @@
                            "Name already exists.")
     
+    owner = validation.testOwner(user, fields.getfirst('owner'))
+
     memory = fields.getfirst('memory')
     memory = validation.validMemory(user, memory, on=True)
@@ -148 +144 @@
     if cdrom is not None and not CDROM.get(cdrom):
         raise CodeError("Invalid cdrom type '%s'" % cdrom)
-    return dict(user=user, name=name, memory=memory, disk=disk,
-                is_hvm=is_hvm, cdrom=cdrom)
+    return dict(contact=user, name=name, memory=memory, disk=disk,
+                owner=owner, is_hvm=is_hvm, cdrom=cdrom)
 
 def create(user, fields):
@@ -189 +185 @@
     defaults = Defaults(max_memory=max_memory,
                         max_disk=max_disk,
+                        owner=user,
                         cdrom='gutsy-i386')
     d = dict(user=user,
@@ -231 +228 @@
 
     data = {}
-    data["user"] = user.username
+    data["user"] = user
     data["machine"] = machine.name
     data["expires"] = time.time()+(5*60)
@@ -545 +542 @@
     if 'SSL_CLIENT_S_DN_Email' in os.environ:
         username = os.environ['SSL_CLIENT_S_DN_Email'].split("@")[0]
-        return User(username, os.environ['SSL_CLIENT_S_DN_Email'])
-    else:
-        return User('moo', 'nobody')
+        return username
+    else:
+        return 'moo'
 
 def main(operation, user, fields):