IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Using client-side 'url_for' implementation in the restore module.

Browse Source
This commit is contained in:
Ashesh Vashi 2017-06-13 09:06:42 +05:30
parent 4a46f7b1eb
commit f9a3878220
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/tools/restore/__init__.py
View File

@ -51,6 +51,12 @@ class RestoreModule(PgAdminModule):
'when': None
}]
def get_exposed_url_endpoints(self):
"""
Returns:
list: URL endpoints for backup module
"""
return ['restore.create_job']
# Create blueprint for RestoreModule class
blueprint = RestoreModule(
@ -160,7 +166,7 @@ def filename_with_file_manager_path(_file):
return fs_short_path(_file)
@blueprint.route('/create_job/<int:sid>', methods=['POST'])
@blueprint.route('/job/<int:sid>', methods=['POST'], endpoint='create_job')
@login_required
def create_restore_job(sid):
"""

18
web/pgadmin/tools/restore/templates/restore/js/restore.js
View File

@ -1,10 +1,11 @@
// Restore dialog
define([
'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'alertify',
'pgadmin.browser', 'backbone', 'backgrid', 'backform',
'pgadmin.browser.node'
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'alertify', 'pgadmin.browser', 'backbone', 'backgrid',
'backform', 'pgadmin.browser.node'
], function(
gettext, $, _, S, alertify, pgBrowser, Backbone, Backgrid, Backform, pgNode
gettext, url_for, $, _, S, alertify, pgBrowser, Backbone, Backgrid, Backform,
pgNode
) {
// if module is already initialized, refer to that.
@ -370,8 +371,10 @@ define([
attrs:{name:'object_help', type:'button', url: 'backup.html', label: gettext('Restore')}
},{
text: '', key: 112, className: 'btn btn-default pull-left fa fa-lg fa-question',
attrs:{name:'dialog_help', type:'button', label: gettext('Restore'),
url: '{{ url_for('help.static', filename='restore_dialog.html') }}'}
attrs:{
name:'dialog_help', type:'button', label: gettext('Restore'),
url: url_for('help.static', {'filename': 'restore_dialog.html'})
}
},{
text: gettext('Restore'), key: 13,
className: 'btn btn-primary fa fa-upload pg-alertify-button', restore: true,
@ -517,8 +520,7 @@ define([
}
var self = this,
baseUrl = "{{ url_for('restore.index') }}create_job/" +
info.server._id,
baseUrl = url_for('restore.create_job', {'sid': info.server._id}),
args = this.view.model.toJSON();
$.ajax({