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

Allow queries to be cancelled from the dashboard, and display additional info in the subnode control. Fixes #2597

Browse Source
This commit is contained in:
Murtuza Zabuawala
2017-08-25 16:57:33 +01:00
committed by Dave Page
parent 46c5df4e7b
commit 74db837417
5 changed files with 200 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/static/js/backgrid.pgadmin.js
View File

@@ -217,12 +217,14 @@
postRender: function(model, column) {
var editor = this,
el = this.el,
columns_length = this.columns_length;
columns_length = this.columns_length,
// To render schema directly from Backgrid cell we use columns schema attribute
schema = this.schema.length ? this.schema : this.column.get('schema');
if (column != null && column.get("name") != this.column.get("name"))
return false;
if (!_.isArray(this.schema)) throw new TypeError("schema must be an array");
if (!_.isArray(schema)) throw new TypeError("schema must be an array");
// Create a Backbone model from our object if it does not exist
var $dialog = this.createDialog(columns_length);
@@ -235,7 +237,7 @@
var back_el = $dialog.find('form.form-dialog');
this.objectView = new Backform.Dialog({
el: back_el, model: this.model, schema: this.schema,
el: back_el, model: this.model, schema: schema,
tabPanelClassName: function() {
return 'sub-node-form col-sm-12';
}