Fixed following issues:

1) Grant wizard close issue.
   2) Moved grant wizard specific css from wizard.css to grant_wizard.css
   3) removed 'ajs_content' css from wizard.css causing padding issue in alertify dialog
This commit is contained in:
Surinder Kumar
2016-05-13 15:04:36 +05:30
committed by Akshay Joshi
parent 174363c9a7
commit 938ea21f40
3 changed files with 43 additions and 47 deletions

View File

@@ -11,9 +11,14 @@
}
.object_type_table {
display: inline-block;
height: 100%;
border: 0 !important;
display: inline;
}
.object_type_table thead {
display: table;
width: 100%;
}
.object_type_table thead tr {
@@ -24,7 +29,7 @@
.object_type_table tbody {
display: block;
overflow: scroll;
overflow: auto;
border: 1px solid #ddd;
width: 100%;
min-height: 100%;
@@ -107,3 +112,10 @@
.wizard-right-panel_content .CodeMirror-gutters {
min-height: 285px !important;
}
.grant_wizard_container {
position: relative;
overflow: hidden;
width: 100%;
height: 100%;
}

View File

@@ -93,7 +93,6 @@ define([
var col = this.column.get('name');
if (this.model && this.model.has(col)) {
if (this.model.get(col)) {
this.checkbox().prop("checked", true);
this.$el.parent().toggleClass("selected", true);
this.model.trigger("backgrid:selected", this.model, true);
}
@@ -142,7 +141,7 @@ define([
var supported_nodes = [
'schema', 'coll-function', 'coll-sequence',
'coll-table', 'coll-view', 'coll-procedure',
'coll-materialized_view', 'database'
'coll-mview', 'database'
],
/**
@@ -201,7 +200,6 @@ define([
},
setup:function() {
return {
// Set options for dialog
options: {
frameless: true,
@@ -946,8 +944,9 @@ define([
dataType: "json",
contentType: "application/json"
}).done(function(res) {
self.sqlTab.clearHistory();
self.sqlTab.setValue(res.data);
self.sqlCtrl.clearHistory();
self.sqlCtrl.setValue(res.data);
self.sqlCtrl.refresh();
}).fail(function() {
self.model.trigger('pgadmin-view:msql:error');
}).always(function() {
@@ -959,9 +958,9 @@ define([
// Clear html dom elements of CodeMirror sql tab
self.sqlControl.unbind(); // Unbind all local event bindings
var cmElem = self.sqlControl.sqlTab.getWrapperElement();
var cmElem = self.sqlControl.sqlCtrl.getWrapperElement();
cmElem.remove();
self.sqlControl.sqlTab = undefined;
self.sqlControl.sqlCtrl = undefined;
}
})
@@ -987,9 +986,9 @@ define([
view: new(function() {
// Render SqlTab control to generate its html markup
var sqlTabHtml = sqlControl.render().$el;
var sqlCtrlHtml = sqlControl.render().$el;
this.render = function() {
return { el: sqlTabHtml };
return { el: sqlCtrlHtml };
};
}),