Changeset 864 for trunk/packages


Ignore:
Timestamp:
Aug 4, 2008, 10:28:18 PM (16 years ago)
Author:
price
Message:

more sipb_xen_database -> invirt.database in web

Location:
trunk/packages/sipb-xen-www/code
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/sipb-xen-www/code/main.py

    r863 r864  
    4040import controls
    4141from getafsgroups import getAfsGroupMembers
    42 import sipb_xen_database
    43 from invirt import database
     42import sipb_xen_database as database
    4443from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
    4544from invirt.config import structs as config
     
    8685        return '<p>STDERR:</p><pre>' + str(addition) + '</pre>'
    8786
    88 Template.sipb_xen_database = sipb_xen_database
     87Template.database = database
    8988Template.helppopup = staticmethod(helppopup)
    9089Template.err = None
     
    679678    def __iter__(self):
    680679        start_time = time.time()
    681         sipb_xen_database.clear_cache()
     680        database.clear_cache()
    682681        sys.stderr = StringIO()
    683682        fields = cgi.FieldStorage(fp=self.environ['wsgi.input'], environ=self.environ)
  • trunk/packages/sipb-xen-www/code/templates/functions.tmpl

    r515 r864  
    2121#def cdromList($default="", $onchange=None)
    2222#filter None
    23 $databaseList(sorted($sipb_xen_database.CDROM.select(), key=lambda x: x.description),
     23$databaseList(sorted($database.CDROM.select(), key=lambda x: x.description),
    2424              default, onchange, 'cdrom', 'cdromlist', 'cdrom_id', 'description')
    2525#end filter
     
    2828#def autoList($default="", $onchange=None)
    2929#filter None
    30 $databaseList(sorted($sipb_xen_database.Autoinstall.select(), key=lambda x: x.description),
     30$databaseList(sorted($database.Autoinstall.select(), key=lambda x: x.description),
    3131              default, onchange, 'autoinstall', 'autoinstalllist', 'autoinstall_id', 'description')
    3232#end filter
  • trunk/packages/sipb-xen-www/code/webcommon.py

    r632 r864  
    22
    33import time
    4 from sipb_xen_database import Machine, MachineAccess
     4from invirt.database import Machine, MachineAccess
    55
    66class MyException(Exception):
Note: See TracChangeset for help on using the changeset viewer.