diff --git a/VERSION b/VERSION index 17d7a984..2c6da68c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-09 08:57:54) dev +Version 2.00.0 (2012-08-09 23:09:46) dev diff --git a/applications/admin/controllers/wizard.py b/applications/admin/controllers/wizard.py index f870d488..e116830f 100644 --- a/applications/admin/controllers/wizard.py +++ b/applications/admin/controllers/wizard.py @@ -248,8 +248,11 @@ def sort_tables(tables): def append(table,trail=[]): if table in trail: raise RuntimeError - for t in d[table]: append(t,trail=trail+[table]) - if not table in tables: tables.append(table) + for t in d[table]: + # if not t==table: (problem, no dropdown for self references) + append(t,trail=trail+[table]) + if not table in tables: + tables.append(table) for table in d: append(table) return tables diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html index e12fe0ea..44088f2d 100644 --- a/applications/welcome/views/layout.html +++ b/applications/welcome/views/layout.html @@ -45,6 +45,10 @@ response.files.append(URL('static','css/web2py.css')) response.files.append(URL('static','css/bootswatch.css')) }} + + {{include 'web2py_ajax.html'}} diff --git a/gluon/utils.py b/gluon/utils.py index ab71ed33..52e04068 100644 --- a/gluon/utils.py +++ b/gluon/utils.py @@ -44,7 +44,7 @@ def simple_hash(text, key='', salt = '', digest_alg = 'md5'): raise RuntimeError, "simple_hash with digest_alg=None" elif not isinstance(digest_alg,str): h = digest_alg(text+key+salt) - elif key+salt: # backward compatile + elif key: # backward compatile return hmac_hash(text, key+salt, digest_alg) else: # compatible with third party systems h = hashlib.new(digest_alg)