dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no more plugins in wizard

Browse Source
This commit is contained in:
mdipierro
2013-08-30 17:38:49 +02:00
committed by Michele Comitini
parent 5bdfbc98dd
commit f18b264ca1
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.08.25.07.39.32 Version 2.6.0-development+timestamp.2013.08.25.19.34.35
applications/admin/controllers/wizard.py
+12 -12
View File
@@ -83,20 +83,20 @@ def step1():
from gluon.contrib.simplejson import loads from gluon.contrib.simplejson import loads
import urllib import urllib
if not session.themes: if not session.themes:
url = LAYOUTS_APP + '/default/layouts.json' #url = LAYOUTS_APP + '/default/layouts.json'
try: #try:
data = urllib.urlopen(url).read() # data = urllib.urlopen(url).read()
session.themes = ['Default'] + loads(data)['layouts'] # session.themes = ['Default'] + loads(data)['layouts']
except: #except:
session.themes = ['Default'] session.themes = ['Default']
themes = session.themes themes = session.themes
if not session.plugins: if not session.plugins:
url = PLUGINS_APP + '/default/plugins.json' #url = PLUGINS_APP + '/default/plugins.json'
try: #try:
data = urllib.urlopen(url).read() # data = urllib.urlopen(url).read()
session.plugins = loads(data)['plugins'] # session.plugins = loads(data)['plugins']
except: #except:
session.plugins = [] session.plugins = []
plugins = [x.split('.')[2] for x in session.plugins] plugins = [x.split('.')[2] for x in session.plugins]
response.view = 'wizard/step.html' response.view = 'wizard/step.html'
params = dict(session.app['params']) params = dict(session.app['params'])