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

fixed problem with get_app when app does not exist

Browse Source
This commit is contained in:
mdipierro authored and Michele Comitini committed 2013-08-30 17:38:48 +02:00
1 parent 838a1ffc82
commit 667009318e
2 files changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.08.23.14.37.05 Version 2.6.0-development+timestamp.2013.08.23.14.45.37
applications/admin/controllers/default.py
+2 -1
View File
@@ -86,7 +86,8 @@ def safe_write(a, value, b='w'):
def get_app(name=None): def get_app(name=None):
app = name or request.args(0) app = name or request.args(0)
if (app and os.path.exists(os.path.join(os.path.dirname(request.folder),app)) and folder = request.folder if not request.folder.endswith('/') else request.folder[:-1]
if (app and os.path.exists(os.path.join(os.path.dirname(folder),app)) and
(not MULTI_USER_MODE or is_manager() or (not MULTI_USER_MODE or is_manager() or
db(db.app.name == app)(db.app.owner == auth.user.id).count())): db(db.app.name == app)(db.app.owner == auth.user.id).count())):
return app return app