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

Do not set focus to the properties container, when selected any node.

Browse Source 
As discussed with Khushboo, we need a negate function of disabled in the
backgrid cell.
This commit is contained in:
Ashesh Vashi 2015-11-03 12:36:32 +05:30
parent a1170c4c82
commit cbab08aaaf
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/browser/templates/browser/js/node.js
View File

@ -149,7 +149,9 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
// object. Render the view now.
newModel.startNewSession();
view.render();
$(el).focus();
if (type != 'properties') {
$(el).focus();
}
})
.error(function(jqxhr, error, message) {
// TODO:: We may not want to continue from here

18
web/pgadmin/static/js/backform.pgadmin.js
View File

@ -33,6 +33,20 @@
}
}(this, function(root, _, $, Backbone, Backform, Backgrid) {
var pgAdmin = (window.pgAdmin = window.pgAdmin || {});
pgAdmin.editableCell = function(m) {
if (this.attributes && this.attributes.disabled) {
if(_.isFunction(this.attributes.disabled)) {
return !(this.attributes.disabled.apply(this, [m]));
}
if (_.isBoolean(this.attributes.disabled)) {
return !this.attributes.disabled;
}
}
return true;
};
// HTML markup global class names. More can be added by individual controls
// using _.extend. Look at RadioControl as an example.
_.extend(Backform, {
@ -421,7 +435,7 @@
return ((prop && proto[prop] &&
typeof proto[prop] == "function") ? proto[prop] : prop);
};
groups = {};
groups = {};
_.each(schema, function(s) {
// Do we understand - what control, we're creating
@ -447,7 +461,7 @@
visible: evalASFunc(s.show),
// This can be disabled in some cases (if not hidden)
disabled: (mode == 'properties' ? true : evalASFunc(s.disabled)),
editable: (mode == 'properties' ? false : evalASFunc(s.disabled)),
editable: (mode == 'properties' ? false : pgAdmin.editableCell),
subnode: (_.isString(s.model) && s.model in pgBrowser.Nodes) ?
pgBrowser.Nodes[s.model].model : s.model,
canAdd: (mode == 'properties' ? false : evalASFunc(s.canAdd)),