moved settings.cfg to admin

2013-09-06 15:18:17 -05:00
parent 62b59a023d
commit 6203fcb852
2 changed files with 3 additions and 2 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.09.06.14.32.32
+Version 2.6.0-development+timestamp.2013.09.06.15.17.26
--- a/applications/admin/controllers/default.py
+++ b/applications/admin/controllers/default.py
@@ -563,7 +563,8 @@ def edit():
    app = get_app(request.vars.app)
    app_path = apath(app, r=request)
    editor_defaults={'theme':'web2py'}
-    config = Config(os.path.join(app_path, 'settings.cfg'), section='editor', default_values=editor_defaults)
+    config = Config(os.path.join(request.folder, 'settings.cfg'),
+                    section='editor', default_values=editor_defaults)
    preferences = config.read()

    if not(request.ajax):