Changeset 228 for trunk/web/templates/main.py
- Timestamp:
- Oct 28, 2007, 11:57:32 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/web/templates/main.py
r227 r228 47 47 '&simple=true" target="_blank" ' + 48 48 'onclick="return helppopup(\'' + subj + '\')">(?)</a></span>') 49 50 class User:51 """User class (sort of useless, I admit)"""52 def __init__(self, username, email):53 self.username = username54 self.email = email55 49 56 50 def makeErrorPre(old, addition): … … 134 128 "Name already exists.") 135 129 130 owner = validation.testOwner(user, fields.getfirst('owner')) 131 136 132 memory = fields.getfirst('memory') 137 133 memory = validation.validMemory(user, memory, on=True) … … 148 144 if cdrom is not None and not CDROM.get(cdrom): 149 145 raise CodeError("Invalid cdrom type '%s'" % cdrom) 150 return dict( user=user, name=name, memory=memory, disk=disk,151 is_hvm=is_hvm, cdrom=cdrom)146 return dict(contact=user, name=name, memory=memory, disk=disk, 147 owner=owner, is_hvm=is_hvm, cdrom=cdrom) 152 148 153 149 def create(user, fields): … … 189 185 defaults = Defaults(max_memory=max_memory, 190 186 max_disk=max_disk, 187 owner=user, 191 188 cdrom='gutsy-i386') 192 189 d = dict(user=user, … … 231 228 232 229 data = {} 233 data["user"] = user .username230 data["user"] = user 234 231 data["machine"] = machine.name 235 232 data["expires"] = time.time()+(5*60) … … 545 542 if 'SSL_CLIENT_S_DN_Email' in os.environ: 546 543 username = os.environ['SSL_CLIENT_S_DN_Email'].split("@")[0] 547 return User(username, os.environ['SSL_CLIENT_S_DN_Email'])548 else: 549 return User('moo', 'nobody')544 return username 545 else: 546 return 'moo' 550 547 551 548 def main(operation, user, fields):
Note: See TracChangeset
for help on using the changeset viewer.