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

Webpack all the things! Fixes #2135

Browse Source 
This significantly speeds up loading of the application; in an average of 3 tests, v1.6
loaded in 11.5s in the runtime on a Mac, whilst the webpacked version of the code
loaded in 5.53s.
This commit is contained in:
Surinder Kumar
2017-07-18 15:13:16 +01:00
committed by Dave Page
parent d04ac7656a
commit 4a91bcde30
406 changed files with 3556 additions and 164707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
View File

@@ -217,7 +217,7 @@ define('pgadmin.node.language', [
}
return true;
}
}, pgBrowser.SecurityGroupUnderSchema, {
}, {
id: 'lanacl', label: gettext('Privileges'), type: 'collection',
group: 'security', control: 'unique-col-collection', mode: ['edit', 'create'],
model: pgBrowser.Node.PrivilegeRoleModel.extend({

4
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js
View File

@@ -237,8 +237,8 @@ define('pgadmin.node.collation', [
if ('coll-collation' == d._type) {
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;
} else {

4
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
View File

@@ -306,8 +306,8 @@ define('pgadmin.node.domain', [
if ('coll-domain' == d._type) {
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;
} else {

14
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign-table.js
View File

@@ -25,9 +25,9 @@ define('pgadmin.node.foreign-table', [
this.$el.empty();
var model = this.model;
var column = this.column;
editable = this.column.get("editable");
var editable = this.column.get("editable");
var is_editable = _.isFunction(editable) ? !!editable.apply(column, [model]) : !!editable;
is_editable = _.isFunction(editable) ? !!editable.apply(column, [model]) : !!editable;
if (is_editable){ this.$el.addClass("editable"); }
else { this.$el.removeClass("editable"); }
@@ -364,7 +364,7 @@ define('pgadmin.node.foreign-table', [
cache_node = (cache_node && pgBrowser.Nodes['cache_node']) || node;
m.trigger('pgadmin:view:fetching', m, self.field);
data = {attrelid: table_id}
var data = {attrelid: table_id}
// Fetching Columns data for the selected table.
$.ajax({
@@ -591,8 +591,8 @@ define('pgadmin.node.foreign-table', [
'cache_level': 'database',
transform: function(d, self){
if (this.field.get('mode') == 'edit') {
oid = this.model.get('oid');
s = _.findWhere(d, {'id': oid});
var oid = this.model.get('oid');
var s = _.findWhere(d, {'id': oid});
if (s) {
d = _.reject(d, s);
}
@@ -697,8 +697,8 @@ define('pgadmin.node.foreign-table', [
if ('coll-foreign-table' == d._type) {
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;
} else {

11
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js
View File

@@ -14,7 +14,7 @@ define('pgadmin.node.fts_configuration', [
// Define the schema for the token/dictionary list
schema: [{
id: 'token', label:'Token', type:'text', group: null,
cellHeaderClasses:'width_percent_50', editable: true,
cellHeaderClasses:'width_percent_50',
editable: false, cell: 'string', url: 'tokens'
},{
id: 'dictname', label: 'Dictionaries', type: 'text', group:null,
@@ -57,6 +57,7 @@ define('pgadmin.node.fts_configuration', [
this, arguments
);
var that;
var self = that = this,
node = 'fts_configuration',
headerSchema = [{
@@ -134,7 +135,7 @@ define('pgadmin.node.fts_configuration', [
/*
* Transform the data
*/
transform = (this.field.get('transform')
var transform = (this.field.get('transform')
|| self.defaults.transform);
if (transform && _.isFunction(transform)) {
self.field.set('options', transform.bind(self, data));
@@ -338,7 +339,7 @@ define('pgadmin.node.fts_configuration', [
// Find if token exists in grid
self.collection.each(function(m) {
_.each(checkVars, function(v) {
val = m.get(v);
var val = m.get(v);
if(val == token) {
idx = coll.indexOf(m);
}
@@ -592,8 +593,8 @@ define('pgadmin.node.fts_configuration', [
if ('coll-fts_configuration' == d._type) {
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;
} else {

4
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js
View File

@@ -197,8 +197,8 @@ define('pgadmin.node.fts_dictionary', [
if ('coll-fts_dictionary' == d._type) {
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;
} else {

5
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/static/js/fts_parser.js
View File

@@ -112,7 +112,6 @@ define('pgadmin.node.fts_parser', [
type: 'text', disabled: function(m) { return !m.isNew(); },
control: 'node-ajax-options', url: 'end_functions',
group: gettext('Definition'), cache_level: 'database',
cache_node: 'schema',
cache_node: 'schema'
},{
id: 'prslextype', label: gettext('Lextypes function'),
@@ -214,8 +213,8 @@ define('pgadmin.node.fts_parser', [
if ('coll-fts_parser' == d._type) {
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;
} else {

4
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js
View File

@@ -153,8 +153,8 @@ define('pgadmin.node.fts_template', [
if ('coll-fts_template' == d._type) {
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;
} else {

14
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
View File

@@ -34,7 +34,7 @@ define('pgadmin.node.function', [
'node-ajax-options', cellHeaderClasses: 'width_percent_30',
control: 'node-ajax-options', type: 'text', url: 'get_types',
editable: function(m) {
node_info = this.get('node_info');
var node_info = this.get('node_info');
if(node_info && 'catalog' in node_info) {
return false;
}
@@ -49,7 +49,7 @@ define('pgadmin.node.function', [
{'label': 'INOUT', 'value': 'INOUT'},
{'label': 'VARIADIC', 'value': 'VARIADIC'}
], editable: function(m) {
node_info = this.get('node_info');
var node_info = this.get('node_info');
if(node_info && 'catalog' in node_info) {
return false;
}
@@ -65,7 +65,7 @@ define('pgadmin.node.function', [
],
toJSON: Backbone.Model.prototype.toJSON,
isInCatalog: function(m){
node_info = this.get('node_info');
var node_info = this.get('node_info');
if(node_info && 'catalog' in node_info) {
return false;
}
@@ -131,7 +131,7 @@ define('pgadmin.node.function', [
var isNew = (_.size(attrs) === 0);
if (isNew) {
// Set Selected Schema
schema_id = args.node_info.schema._id
var schema_id = args.node_info.schema._id;
this.set({'pronamespace': schema_id}, {silent: true});
// Set Current User
@@ -217,7 +217,7 @@ define('pgadmin.node.function', [
mode: ['create'], visible: 'isVisible'
},{
id: 'prorettypename', label: gettext('Return type'), cell: 'string',
type: 'text', group: gettext('Definition'), disabled: true,
type: 'text', group: gettext('Definition'),
mode: ['properties', 'edit'], disabled: 'isDisabled', visible: 'isVisible'
}, {
id: 'lanname', label: gettext('Language'), cell: 'string',
@@ -457,8 +457,8 @@ define('pgadmin.node.function', [
if ('coll-function' == d._type) {
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;
} else {

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js
View File

@@ -17,7 +17,7 @@ define('pgadmin.node.procedure', [
});
};
pgSchemaNode = pgBrowser.Nodes['schema'];
var pgSchemaNode = pgBrowser.Nodes['schema'];
// Inherit Functions Node
if (!pgBrowser.Nodes['procedure']) {

8
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js
View File

@@ -64,7 +64,7 @@ define('pgadmin.node.trigger_function', [
var isNew = (_.size(attrs) === 0);
if (isNew) {
// Set Selected Schema
schema_id = args.node_info.schema._id
var schema_id = args.node_info.schema._id
this.set({'pronamespace': schema_id}, {silent: true});
// Set Current User
@@ -153,7 +153,7 @@ define('pgadmin.node.trigger_function', [
]
},{
id: 'prorettypename', label: gettext('Return type'), cell: 'string',
type: 'text', group: gettext('Definition'), disabled: true,
type: 'text', group: gettext('Definition'),
mode: ['properties', 'edit'], disabled: 'isDisabled', visible: 'isVisible'
}, {
id: 'lanname', label: gettext('Language'), cell: 'string',
@@ -378,8 +378,8 @@ define('pgadmin.node.trigger_function', [
if ('coll-trigger_function' == d._type) {
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;
} else {

6
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js
View File

@@ -74,8 +74,8 @@ define('pgadmin.node.sequence', [
if ('coll-sequence' == d._type) {
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;
} else {
@@ -202,7 +202,7 @@ define('pgadmin.node.sequence', [
validate: function() {
var msg = undefined,
minimum = this.get('minimum'),
maximum = this.get('maximum');
maximum = this.get('maximum'),
start = this.get('start');
if (_.isUndefined(this.get('name'))

11
web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js
View File

@@ -13,7 +13,7 @@ define('pgadmin.node.schema', [
initialize: function() {
Backform.Control.prototype.initialize.apply(this, arguments);
var self = this,
m = this.model;
m = this.model,
url = self.field.get('url');
if (url && m.isNew()) {
@@ -457,9 +457,9 @@ define('pgadmin.node.schema', [
return true;
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d && prev_d._type == 'catalog') {
if(prev_d && prev_d._type == 'catalog') {
return false;
}
i = t.hasParent(i) ? t.parent(i) : null;
@@ -476,7 +476,7 @@ define('pgadmin.node.schema', [
t = pgBrowser.tree;
do {
d = t.itemData(i);
var d = t.itemData(i);
if (
d._type in pgBrowser.Nodes && pgBrowser.Nodes[d._type].hasId
) {
@@ -509,7 +509,8 @@ define('pgadmin.node.schema', [
column = this.column,
editable = this.column.get("editable"),
input = this.$el.find('input[type=checkbox]').first(),
self_name = column.get('name');
self_name = column.get('name'),
is_editable;
is_editable = _.isFunction(editable) ? !!editable.apply(column, [model]) : !!editable;
if (is_editable) {

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/js/check_constraint.js
View File

@@ -51,7 +51,7 @@ define('pgadmin.node.check_constraints', [
},
callbacks: {
validate_check_constraint: function(args) {
var input = args || {};
var input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),

10
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/templates/exclusion_constraint/js/exclusion_constraint.js
View File

@@ -286,7 +286,7 @@ define('pgadmin.node.exclusion_constraint', [
},
remove: function () {
if(self.model.handler) {
tableCols = self.model.top.get('columns');
var tableCols = self.model.top.get('columns');
this.stopListening(tableCols, 'remove' , this.removeColumn);
this.stopListening(tableCols, 'change:name' , this.resetColOptions);
this.stopListening(tableCols, 'change:cltype' , this.resetColOptions);
@@ -561,7 +561,7 @@ define('pgadmin.node.exclusion_constraint', [
newRow.addClass("new");
$(newRow).pgMakeVisible('backform-tab');
} else {
delete m;
//delete m;
}
return false;
@@ -770,7 +770,7 @@ define('pgadmin.node.exclusion_constraint', [
}
},{
id: 'columns', label: gettext('Columns'),
type: 'collection', group: gettext('Columns'), disabled: false,
type: 'collection', group: gettext('Columns'),
deps:['amname'], canDelete: true, editable: false,
canAdd: function(m) {
// We can't update columns of existing exclusion constraint.
@@ -815,7 +815,7 @@ define('pgadmin.node.exclusion_constraint', [
}, 10);
setTimeout(function () {
constraints = self.model.top.get("exclude_constraint");
var constraints = self.model.top.get("exclude_constraint");
var removed = [];
constraints.each(function(constraint) {
if (constraint.get("columns").length == 0) {
@@ -837,7 +837,7 @@ define('pgadmin.node.exclusion_constraint', [
}, 10);
setTimeout(function () {
constraints = self.model.top.get("exclude_constraint");
var constraints = self.model.top.get("exclude_constraint");
var removed = [];
constraints.each(function(constraint) {
if (constraint.get("columns").length == 0) {

11
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js
View File

@@ -225,7 +225,7 @@ define('pgadmin.node.foreign_key', [
/*
* Transform the data
*/
transform = this.field.get('transform') || self.defaults.transform;
var transform = this.field.get('transform') || self.defaults.transform;
if (transform && _.isFunction(transform)) {
// We will transform the data later, when rendering.
// It will allow us to generate different data based on the
@@ -494,7 +494,7 @@ define('pgadmin.node.foreign_key', [
newRow.addClass("new");
$(newRow).pgMakeVisible('backform-tab');
} else {
delete m;
//delete m;
}
return false;
@@ -534,7 +534,7 @@ define('pgadmin.node.foreign_key', [
var self = this,
url = 'get_coveringindex',
m = self.model
m = self.model,
cols = [],
coveringindex = null;
@@ -610,7 +610,6 @@ define('pgadmin.node.foreign_key', [
sqlCreateHelp: 'ddl-constraints.html',
dialogHelp: url_for('help.static', {'filename': 'foreign_key_dialog.html'}),
hasSQL: true,
hasDepends: false,
parent_type: ['table','partition'],
canDrop: true,
canDropCascade: true,
@@ -641,7 +640,7 @@ define('pgadmin.node.foreign_key', [
},
callbacks: {
validate_foreign_key: function(args) {
var input = args || {};
var input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -926,7 +925,7 @@ define('pgadmin.node.foreign_key', [
}, 10);
setTimeout(function () {
constraints = self.model.top.get("foreign_key");
var constraints = self.model.top.get("foreign_key");
var removed = [];
constraints.each(function(constraint) {
if (constraint.get("columns").length == 0) {

4
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/templates/constraints/js/constraints.js
View File

@@ -1,6 +1,8 @@
define('pgadmin.node.constraints', [
'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'pgadmin',
'pgadmin.browser', 'pgadmin.browser.collection'{% for c in constraints %}, 'pgadmin.node.{{ c|safe }}'{%endfor%}
'pgadmin.browser', 'pgadmin.browser.collection', 'pgadmin.node.unique_constraint',
'pgadmin.node.check_constraints', 'pgadmin.node.foreign_key',
'pgadmin.node.exclusion_constraint', 'pgadmin.node.primary_key'
], function(gettext, $, _, S, pgAdmin, pgBrowser) {
if (!pgBrowser.Nodes['coll-constraints']) {

4
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js
View File

@@ -32,7 +32,7 @@ define('pgadmin.node.index', [
editable = this.column.get("editable"),
input = this.$el.find('select').first();
is_editable = _.isFunction(editable) ? !!editable.apply(column, [model]) : !!editable;
var is_editable = _.isFunction(editable) ? !!editable.apply(column, [model]) : !!editable;
if (is_editable) {
this.$el.addClass("editable");
input.prop('disabled', false);
@@ -165,7 +165,7 @@ define('pgadmin.node.index', [
if (_.isUndefined(this.get('colname'))
|| String(this.get('colname')).replace(/^\s+|\s+$/g, '') == '') {
msg = gettext('Column Name cannot be empty.');
var msg = gettext('Column Name cannot be empty.');
this.errorModel.set('colname', msg);
return msg;
}

12
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/js/rules.js
View File

@@ -230,12 +230,12 @@ define('pgadmin.node.rule', [
if ('coll-rule' == d._type) {
//Check if we are not child of rule
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
prev_j = t.hasParent(prev_i) ? t.parent(prev_i) : null;
prev_e = prev_j ? t.itemData(prev_j) : null;
prev_k = t.hasParent(prev_j) ? t.parent(prev_j) : null;
prev_f = prev_k ? t.itemData(prev_k) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null,
prev_j = t.hasParent(prev_i) ? t.parent(prev_i) : null,
prev_e = prev_j ? t.itemData(prev_j) : null,
prev_k = t.hasParent(prev_j) ? t.parent(prev_j) : null,
prev_f = prev_k ? t.itemData(prev_k) : null;
if( prev_f._type == 'catalog') {
return false;
} else {

16
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js
View File

@@ -1,4 +1,4 @@
define(
define('pgadmin.node.table_partition_utils',
['sources/gettext', 'jquery', 'underscore', 'pgadmin.browser',
'backform','backgrid', 'pgadmin.browser.collection'],
function(gettext, $, _, pgBrowser, Backform, Backgrid) {
@@ -205,21 +205,21 @@ function(gettext, $, _, pgBrowser, Backform, Backgrid) {
if (_.isUndefined(col_type) || _.isNull(col_type) ||
String(col_type).replace(/^\s+|\s+$/g, '') == '') {
msg = gettext('Partition key type cannot be empty.');
var msg = gettext('Partition key type cannot be empty.');
this.errorModel.set('key_type', msg);
return msg;
}
else if (col_type == 'column' &&
_.isUndefined(pt_column) || _.isNull(pt_column) ||
String(pt_column).replace(/^\s+|\s+$/g, '') == '') {
msg = gettext('Partition key column cannot be empty.');
var msg = gettext('Partition key column cannot be empty.');
this.errorModel.set('pt_column', msg);
return msg;
}
else if (col_type == 'expression' &&
_.isUndefined(expression) || _.isNull(expression) ||
String(expression).replace(/^\s+|\s+$/g, '') == '') {
msg = gettext('Partition key expression cannot be empty.');
var msg = gettext('Partition key expression cannot be empty.');
this.errorModel.set('expression', msg);
return msg;
}
@@ -306,7 +306,7 @@ function(gettext, $, _, pgBrowser, Backform, Backgrid) {
if (_.isUndefined(partition_name) || _.isNull(partition_name) ||
String(partition_name).replace(/^\s+|\s+$/g, '') == '') {
msg = gettext('Partition name cannot be empty.');
var msg = gettext('Partition name cannot be empty.');
this.errorModel.set('partition_name', msg);
return msg;
}
@@ -314,19 +314,19 @@ function(gettext, $, _, pgBrowser, Backform, Backgrid) {
if (this.top.get('partition_type') == 'range') {
if (_.isUndefined(values_from) || _.isNull(values_from) ||
String(values_from).replace(/^\s+|\s+$/g, '') == '') {
msg = gettext('For range partition From field cannot be empty.');
var msg = gettext('For range partition From field cannot be empty.');
this.errorModel.set('values_from', msg);
return msg;
} else if (_.isUndefined(values_to) || _.isNull(values_to) ||
String(values_to).replace(/^\s+|\s+$/g, '') == '') {
msg = gettext('For range partition To field cannot be empty.');
var msg = gettext('For range partition To field cannot be empty.');
this.errorModel.set('values_to', msg);
return msg;
}
} else if (this.top.get('partition_type') == 'list') {
if (_.isUndefined(values_in) || _.isNull(values_in) ||
String(values_in).replace(/^\s+|\s+$/g, '') == '') {
msg = gettext('For list partition In field cannot be empty.');
var msg = gettext('For list partition In field cannot be empty.');
this.errorModel.set('values_in', msg);
return msg;
}

10
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
View File

@@ -114,7 +114,7 @@ define('pgadmin.node.table', [
set_triggers: function(args, params) {
// This function will send request to enable or
// disable triggers on table level
var input = args || {};
var input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -162,7 +162,7 @@ define('pgadmin.node.table', [
this.callbacks.truncate.apply(this, [args, params]);
},
truncate: function(args, params) {
var input = args || {};
var input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -708,7 +708,7 @@ define('pgadmin.node.table', [
}]
},{
id: 'typname', label: gettext('Of type'), type: 'text',
control: 'node-ajax-options', mode: ['properties', 'create', 'edit'],
mode: ['properties', 'create', 'edit'],
disabled: 'checkOfType', url: 'get_oftype', group: gettext('Advanced'),
deps: ['coll_inherits'], transform: function(data, cell) {
var control = cell || this,
@@ -1244,7 +1244,7 @@ define('pgadmin.node.table', [
var self = this,
url = 'get_columns',
m = self.model.top || self.model,
old_columns = _.clone(m.get('columns'))
old_columns = _.clone(m.get('columns')),
data = undefined,
node = this.field.get('schema_node'),
node_info = this.field.get('node_info'),
@@ -1291,7 +1291,7 @@ define('pgadmin.node.table', [
if ('coll-table' == d._type) {
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;

9
web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js
View File

@@ -24,9 +24,9 @@ define('pgadmin.node.type', [
this.$el.empty();
var model = this.model;
var column = this.column;
editable = this.column.get("editable");
var editable = this.column.get("editable");
is_editable = _.isFunction(editable) ? !!editable.apply(column, [model]) : !!editable;
var is_editable = _.isFunction(editable) ? !!editable.apply(column, [model]) : !!editable;
if (is_editable){ this.$el.addClass("editable"); }
else { this.$el.removeClass("editable"); }
@@ -48,7 +48,7 @@ define('pgadmin.node.type', [
editable = this.column.get("editable"),
input = this.$el.find('select').first();
is_editable = _.isFunction(editable) ? !!editable.apply(column, [model]) : !!editable;
var is_editable = _.isFunction(editable) ? !!editable.apply(column, [model]) : !!editable;
if (is_editable) {
this.$el.addClass("editable");
input.prop('disabled', false);
@@ -337,7 +337,6 @@ define('pgadmin.node.type', [
id: 'typtype', label: gettext('Type'),
mode: ['create','edit'], disabled: 'inSchemaWithModelCheck',
group: gettext('Definition'),
mode: ['edit', 'create'],
select2: { width: "50%", allowClear: false },
options: function(obj) {
return [
@@ -929,7 +928,7 @@ define('pgadmin.node.type', [
if ('coll-type' == d._type) {
//Check if we are not child of catalog
prev_i = t.hasParent(i) ? t.parent(i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;

4
web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js
View File

@@ -261,8 +261,8 @@ define('pgadmin.node.mview', [
if ('coll-mview' == d._type) {
// Check if we are not child of view
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;
} else {

7
web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js
View File

@@ -113,8 +113,7 @@ define('pgadmin.node.view', [
id: 'schema', label: gettext('Schema'), cell: 'string', first_empty: false,
control: 'node-list-by-name', type: 'text', cache_level: 'database',
node: 'schema', disabled: 'notInSchema', mode: ['create', 'edit'],
select2: { allowClear: false }, cache_node: 'database',
cache_level: 'database'
select2: { allowClear: false }, cache_node: 'database'
},{
id: 'system_view', label: gettext('System view?'), cell: 'string',
type: 'switch', disabled: true, mode: ['properties']
@@ -221,8 +220,8 @@ define('pgadmin.node.view', [
if ('coll-view' == d._type) {
// Check if we are not child of view
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_d = prev_i ? t.itemData(prev_i) : null;
var prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_d = prev_i ? t.itemData(prev_i) : null;
if( prev_d._type == 'catalog') {
return false;
} else {

2
web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
View File

@@ -1,6 +1,6 @@
define('pgadmin.node.database', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
'underscore.string', 'pgadmin', 'pgadmin.browser.utils', 'alertify',
'sources/alerts/alertify_wrapper',
'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',

32
web/pgadmin/browser/server_groups/servers/static/js/privilege.js
View File

@@ -1,31 +1,5 @@
(function(root, factory) {
// Set up Backform appropriately for the environment. Start with AMD.
if (typeof define === 'function' && define.amd) {
define(['sources/gettext', 'underscore', 'jquery', 'backbone', 'backform', 'backgrid', 'alertify', 'pgadmin.browser.node'],
function(gettext, _, $, Backbone, Backform, Backgrid, Alertify, pgNode) {
// Export global even in AMD case in case this script is loaded with
// others that may still expect a global Backform.
return factory(root, gettext, _, $, Backbone, Backform, Backgrid, Alertify, pgNode);
});
// Next for Node.js or CommonJS. jQuery may not be needed as a module.
} else if (typeof exports !== 'undefined') {
var _ = require('underscore') || root._,
$ = root.jQuery || root.$ || root.Zepto || root.ender,
Backbone = require('backbone') || root.Backbone,
Backform = require('backform') || root.Backform;
Backgrid = require('backgrid') || root.Backgrid;
Alertify = require('alertify') || root.Alertify;
pgAdmin = require('pgadmin.browser.node') || root.pgAdmin.Browser.Node,
gettext = require('sources/gettext') || root.gettext;
factory(root, gettext, _, $, Backbone, Backform, Alertify, pgNode);
// Finally, as a browser global.
} else {
factory(root, root.gettext, root._, (root.jQuery || root.Zepto || root.ender || root.$), root.Backbone, root.Backform, root.Backgrid, root.alertify, root.pgAdmin.Browser.Node);
}
} (this, function(root, gettext, _, $, Backbone, Backform, Backgrid, Alertify, pgNode) {
define(['sources/gettext', 'underscore', 'jquery', 'backbone', 'backform', 'backgrid', 'alertify', 'pgadmin.browser.node', 'pgadmin.browser.node.ui'],
function(gettext, _, $, Backbone, Backform, Backgrid, Alertify, pgNode) {
/**
* Each Privilege, supporeted by an database object, will be represented
* using this Model.
@@ -715,4 +689,4 @@
return PrivilegeRoleModel;
}));
});

4
web/pgadmin/browser/server_groups/servers/static/js/server.js
View File

@@ -3,7 +3,7 @@ define('pgadmin.node.server', [
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.server.supported_servers',
'pgadmin.user_management.current_user',
'sources/alerts/alertify_wrapper',
'sources/alerts/alertify_wrapper', 'pgadmin.browser.server.privilege'
], function(
gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify,
supported_servers, current_user, AlertifyWrapper
@@ -1037,7 +1037,7 @@ define('pgadmin.node.server', [
};
data.is_connecting = true;
url = obj.generate_url(item, "connect", data, true);
var url = obj.generate_url(item, "connect", data, true);
$.post(url)
.done(function(res) {
if (res.success == 1) {

44
web/pgadmin/browser/server_groups/servers/static/js/variable.js
View File

@@ -1,36 +1,8 @@
(function(root, factory) {
// Set up Backform appropriately for the environment. Start with AMD.
if (typeof define === 'function' && define.amd) {
define([
'underscore', 'jquery', 'backbone', 'backform', 'backgrid', 'alertify',
'pgadmin', 'pgadmin.browser.node', 'pgadmin.browser.node.ui'
],
function(_, $, Backbone, Backform, Backgrid, Alertify, pgAdmin, pgNode) {
// Export global even in AMD case in case this script is loaded with
// others that may still expect a global Backform.
return factory(root, _, $, Backbone, Backform, Alertify, pgAdmin, pgNode);
});
// Next for Node.js or CommonJS. jQuery may not be needed as a module.
} else if (typeof exports !== 'undefined') {
var _ = require('underscore') || root._,
$ = root.jQuery || root.$ || root.Zepto || root.ender,
Backbone = require('backbone') || root.Backbone,
Backform = require('backform') || root.Backform;
Alertify = require('alertify') || root.Alertify;
pgAdmin = require('pgadmin') || root.pgAdmin,
pgNode = require('pgadmin.browser.node') || root.pgAdmin.Browser.Node;
factory(root, _, $, Backbone, Backform, Alertify, pgAdmin, pgNode);
// Finally, as a browser global.
} else {
factory(
root, root._, (root.jQuery || root.Zepto || root.ender || root.$),
root.Backbone, root.Backform, root.pgAdmin.Browser.Node
);
}
} (this, function(root, _, $, Backbone, Backform, Alertify, pgAdmin, pgNode) {
define([
'underscore', 'jquery', 'backbone', 'backform', 'backgrid', 'alertify',
'pgadmin', 'pgadmin.browser.node', 'pgadmin.browser.node.ui'
],
function(_, $, Backbone, Backform, Backgrid, Alertify, pgAdmin, pgNode) {
/*
* cellFunction for variable control.
@@ -159,7 +131,7 @@
},
schema: [
{
id: 'name', label:'Name', type:'text', editable: true, cellHeaderClasses: 'width_percent_30',
id: 'name', label:'Name', type:'text', cellHeaderClasses: 'width_percent_30',
editable: function(m) {
return (m instanceof Backbone.Collection) ? true : m.isNew();
},
@@ -513,8 +485,6 @@
newRow.addClass("new");
$(newRow).pgMakeVisible('backform-tab');
} else {
delete m;
}
return false;
@@ -522,4 +492,4 @@
});
return VariableModel;
}));
});

2
web/pgadmin/browser/server_groups/static/js/server-group.js
View File

@@ -1,4 +1,4 @@
define('pgadmin.node.server-group', [
define('pgadmin.node.server_group', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'pgadmin',
'backbone', 'pgadmin.browser', 'pgadmin.browser.node'
], function(gettext, url_for, $, _, pgAdmin, Backbone) {