Using client-side implementation of 'url_for' in the settings module.
parent
5c140b3f58
commit
900ccebb50
|
@ -49,7 +49,7 @@ class SettingsModule(PgAdminModule):
|
||||||
Returns:
|
Returns:
|
||||||
list: a list of url endpoints exposed to the client.
|
list: a list of url endpoints exposed to the client.
|
||||||
"""
|
"""
|
||||||
return ['settings.store', 'settings.store_bulk']
|
return ['settings.store', 'settings.store_bulk', 'settings.reset_layout']
|
||||||
|
|
||||||
|
|
||||||
blueprint = SettingsModule(MODULE_NAME, __name__)
|
blueprint = SettingsModule(MODULE_NAME, __name__)
|
||||||
|
@ -122,37 +122,7 @@ def store(setting=None, value=None):
|
||||||
result=request.form)
|
result=request.form)
|
||||||
|
|
||||||
|
|
||||||
@blueprint.route("/get", methods=['POST'])
|
@blueprint.route("/layout", methods=['DELETE'], endpoint='reset_layout')
|
||||||
@blueprint.route("/get/<setting>", methods=['GET'])
|
|
||||||
@blueprint.route("/get/<setting>/<default>", methods=['GET'])
|
|
||||||
@login_required
|
|
||||||
def get(setting=None, default=None):
|
|
||||||
"""Get a configuration setting."""
|
|
||||||
if request.method == 'POST':
|
|
||||||
setting = request.form['setting']
|
|
||||||
default = request.form['default']
|
|
||||||
|
|
||||||
success = 1
|
|
||||||
errormsg = ''
|
|
||||||
|
|
||||||
try:
|
|
||||||
value = get_setting(setting, default)
|
|
||||||
except Exception as e:
|
|
||||||
success = 0
|
|
||||||
errormsg = e.message
|
|
||||||
|
|
||||||
try:
|
|
||||||
info = traceback.format_exc()
|
|
||||||
except Exception as e:
|
|
||||||
info = str(e)
|
|
||||||
|
|
||||||
return make_json_response(success=success,
|
|
||||||
errormsg=errormsg,
|
|
||||||
info=info,
|
|
||||||
result=request.form)
|
|
||||||
|
|
||||||
|
|
||||||
@blueprint.route("/reset_layout", methods=['DELETE'])
|
|
||||||
@login_required
|
@login_required
|
||||||
def reset_layout():
|
def reset_layout():
|
||||||
"""Reset configuration setting"""
|
"""Reset configuration setting"""
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
define(
|
define(
|
||||||
['jquery', 'alertify', 'pgadmin', 'underscore', 'backform', 'sources/gettext', 'pgadmin.backform'],
|
[
|
||||||
|
'jquery', 'alertify', 'pgadmin', 'underscore', 'backform',
|
||||||
|
'sources/gettext', 'sources/url_for', 'pgadmin.backform'
|
||||||
|
],
|
||||||
// This defines the Preference/Options Dialog for pgAdmin IV.
|
// This defines the Preference/Options Dialog for pgAdmin IV.
|
||||||
function($, alertify, pgAdmin, _, Backform, gettext) {
|
function($, alertify, pgAdmin, _, Backform, gettext, url_for) {
|
||||||
pgAdmin = pgAdmin || window.pgAdmin || {};
|
pgAdmin = pgAdmin || window.pgAdmin || {};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -30,7 +32,7 @@ define(
|
||||||
$('body').append(reloadingIndicator);
|
$('body').append(reloadingIndicator);
|
||||||
// Delete the record from database as well, then only reload page
|
// Delete the record from database as well, then only reload page
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "{{ url_for('settings.reset_layout') }}",
|
url: url_for('settings.reset_layout'),
|
||||||
type: 'DELETE',
|
type: 'DELETE',
|
||||||
async: false,
|
async: false,
|
||||||
success: function() {
|
success: function() {
|
||||||
|
|
Loading…
Reference in New Issue