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 viewing of long data values in the grid. Fixes #1672

Browse Source
This commit is contained in:
Murtuza Zabuawala
2016-09-12 12:39:40 +01:00
committed by Dave Page
parent 28b7a033bc
commit ffc58b74d2
3 changed files with 387 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
View File

@@ -276,8 +276,8 @@ define(
var notify = false, msg;
if(self.handler.can_edit) {
var data_store = self.handler.data_store;
if(_.size(data_store.added) ||
_.size(data_store.updated)) {
if(data_store && (_.size(data_store.added) ||
_.size(data_store.updated))) {
msg = '{{ _('The data has been modified, but not saved. Are you sure you wish to discard the changes?') }}';
notify = true;
}
@@ -515,9 +515,7 @@ define(
collection = [];
}
// Create an array for client filter
var filter_array = new Array(),
grid_columns = new Array(),
var grid_columns = new Array(),
checkboxSelector;
checkboxSelector = new Slick.CheckboxSelectColumn({
@@ -527,37 +525,35 @@ define(
grid_columns.push(checkboxSelector.getColumnDefinition());
_.each(columns, function(c) {
filter_array.push(c.name);
var options = {
id: c.name,
field: c.name,
name: c.label
};
// If grid is editable then add editor
if(is_editable) {
if(c.cell == 'Json') {
options['editor'] = Slick.Editors.JsonText;
} else if(c.cell == 'number') {
options['editor'] = Slick.Editors.Text;
} else if(c.cell == 'boolean') {
options['editor'] = Slick.Editors.Checkbox;
} else {
options['editor'] = Slick.Editors.pgText;
}
// If grid is editable then add editor else make it readonly
if(c.cell == 'Json') {
options['editor'] = is_editable ? Slick.Editors.JsonText
: Slick.Editors.ReadOnlyJsonText;
options['formatter'] = Slick.Formatters.JsonString;
} else if(c.cell == 'number') {
options['editor'] = is_editable ? Slick.Editors.Text
: Slick.Editors.ReadOnlyText;
options['formatter'] = Slick.Formatters.Numbers;
} else if(c.cell == 'boolean') {
options['editor'] = is_editable ? Slick.Editors.Checkbox
: Slick.Editors.ReadOnlyCheckbox;
options['formatter'] = Slick.Formatters.Checkmark;
} else {
options['editor'] = is_editable ? Slick.Editors.pgText
: Slick.Editors.ReadOnlypgText;
}
// To handle json & boolean formatter in grid
if(c.cell == 'Json') {
options['formatter'] = Slick.Formatters.JsonString;
} else if(c.cell == 'boolean') {
options['formatter'] = Slick.Formatters.Checkmark;
}
grid_columns.push(options)
grid_columns.push(options)
});
var grid_options = {
editable: is_editable,
editable: true,
enableAddRow: is_editable,
enableCellNavigation: true,
enableColumnReorder: false,