Config API, session is used only when filesystem is not available for storing data
This commit is contained in:
@@ -11,10 +11,11 @@ import re
|
||||
from gluon.admin import *
|
||||
from gluon.fileutils import abspath, read_file, write_file
|
||||
from gluon.utils import web2py_uuid
|
||||
from gluon.tools import Config
|
||||
from glob import glob
|
||||
import shutil
|
||||
import platform
|
||||
import ConfigParser
|
||||
|
||||
try:
|
||||
import git
|
||||
if git.__version__ < '0.3.1':
|
||||
@@ -561,16 +562,10 @@ def edit():
|
||||
""" File edit handler """
|
||||
# Load json only if it is ajax edited...
|
||||
app = get_app(request.vars.app)
|
||||
admin_path = apath("admin", r=request)
|
||||
app_path = apath(app, r=request)
|
||||
editor_defaults={'theme':'web2py'}
|
||||
config = ConfigParser.ConfigParser(editor_defaults)
|
||||
config.read( os.path.join(admin_path, 'settings.cfg') )
|
||||
if not config.has_section('editor'):
|
||||
config.add_section('editor')
|
||||
if not( isinstance(session.editor_settings, dict) ):
|
||||
preferences = dict(config.items('editor'))
|
||||
else:
|
||||
preferences = session.editor_settings
|
||||
config = Config(os.path.join(app_path, 'settings.cfg'), section='editor', default_values=editor_defaults)
|
||||
preferences = config.read()
|
||||
|
||||
if not(request.ajax):
|
||||
# return the scaffolding, the rest will be through ajax requests
|
||||
@@ -586,18 +581,14 @@ def edit():
|
||||
editarea_preferences[key] = globals()[key]
|
||||
return response.render ('default/edit.html', dict(app=request.args[0], editor_settings=preferences, editarea_preferences=editarea_preferences))
|
||||
|
||||
# show settings tab and save prefernces
|
||||
# show settings tab and save prefernces
|
||||
if 'settings' in request.vars:
|
||||
if request.post_vars: #save new preferences
|
||||
for option, value in request.post_vars.items():
|
||||
config.set('editor', option, value)
|
||||
try:
|
||||
config.write(open(os.path.join(admin_path, 'settings.cfg'), 'w'))
|
||||
if config.save(request.post_vars.items()):
|
||||
response.headers["web2py-component-flash"] = T('Preferences saved correctly')
|
||||
except:
|
||||
else:
|
||||
response.headers["web2py-component-flash"] = T('Preferences saved on session only')
|
||||
session.editor_settings = dict(config.items('editor'))
|
||||
response.headers["web2py-component-command"] = "update_theme('%s'); jQuery('a[href=#editor_settings] button.close').click();" % config.get('editor', 'theme')
|
||||
response.headers["web2py-component-command"] = "update_theme('%s'); jQuery('a[href=#editor_settings] button.close').click();" % config.read()['theme']
|
||||
return
|
||||
else:
|
||||
details = {'filename':'settings', 'id':'editor_settings', 'force': False}
|
||||
|
||||
Reference in New Issue
Block a user