From: <df...@us...> - 2012-05-25 16:17:04
|
Revision: 4051 http://openutils.svn.sourceforge.net/openutils/?rev=4051&view=rev Author: dfghi Date: 2012-05-25 16:16:57 +0000 (Fri, 25 May 2012) Log Message: ----------- CONTROLS-48 Backport 4049: Disabled insert/remove icons when the add rows is disabled (it means the number of rows is fixed). Modified Paths: -------------- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl =================================================================== --- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2012-05-25 15:48:50 UTC (rev 4050) +++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2012-05-25 16:16:57 UTC (rev 4051) @@ -303,7 +303,8 @@ iconCls: 'button-insert-row', handler: function() { gridInsertRow(grid, ${(!addRowsEnabled)?string}); - } + }, + disabled: ${(!addRowsEnabled)?string} }, { text: '', tooltip: 'Remove row', @@ -311,7 +312,8 @@ iconCls: 'button-remove-row', handler: function() { gridRemoveRow(grid, ${(!addRowsEnabled)?string}); - } + }, + disabled: ${(!addRowsEnabled)?string} }], [#if (configuration.height??)] height: ${configuration.height}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <df...@us...> - 2012-05-28 08:37:39
|
Revision: 4054 http://openutils.svn.sourceforge.net/openutils/?rev=4054&view=rev Author: dfghi Date: 2012-05-28 08:37:33 +0000 (Mon, 28 May 2012) Log Message: ----------- CONTROLS-38 Backport of r4053: "Paste form excel" and "clear all" now can be disabled. Revision Links: -------------- http://openutils.svn.sourceforge.net/openutils/?rev=4053&view=rev Modified Paths: -------------- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl =================================================================== --- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2012-05-28 08:34:10 UTC (rev 4053) +++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2012-05-28 08:37:33 UTC (rev 4054) @@ -196,6 +196,8 @@ var rows = hidden.value.split(/\r?\n/); [#assign addRowsEnabled = (configuration['addRowsEnabled']!false)?string == 'true'] + [#assign pasteFromExcelEnabled = (configuration['pasteFromExcelEnabled']!true)?string == 'true'] + [#assign clearAllEnabled = (configuration['clearAllEnabled']!true)?string == 'true'] [#assign cfgRows = configuration.rows!10] [#if (addRowsEnabled)] var numOfRows= Math.max(${cfgRows}, rows.length); @@ -271,7 +273,8 @@ } } } - } + }, + disabled: ${(!clearAllEnabled)?string} }, { text: 'Paste from spreadsheet', tooltip: 'Paste from spreadsheet', @@ -279,7 +282,8 @@ iconCls: 'button-paste', handler: function() { mgnlOpenWindow('/.resources/controls/clipboard.html?name=${name}&expand=${addRowsEnabled?string}', 320, 200); - } + }, + disabled: ${(!pasteFromExcelEnabled)?string} }, { text: '', tooltip: 'Move row up', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2013-01-07 14:40:40
|
Revision: 4179 http://openutils.svn.sourceforge.net/openutils/?rev=4179&view=rev Author: diego_schivo Date: 2013-01-07 14:40:33 +0000 (Mon, 07 Jan 2013) Log Message: ----------- grid.ftl: mgnlDialogFormSubmit, itemAt Modified Paths: -------------- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl =================================================================== --- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2013-01-06 09:59:11 UTC (rev 4178) +++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2013-01-07 14:40:33 UTC (rev 4179) @@ -331,13 +331,14 @@ grid.setWidth(grid.container.getWidth()); }); - grid.on('afteredit', function(grid) { - var dat = grid.grid.store.data; - var cm = grid.grid.getColumnModel(); + var _mgnlDialogFormSubmit = mgnlDialogFormSubmit; + mgnlDialogFormSubmit = function() { + var dat = grid.store.data; + var cm = grid.getColumnModel(); var fullValue = '', j, row, k, cell; for (j = 0; j < dat.length; j++) { - row = dat.item(j); + row = dat.itemAt(j); for (k = 0; k < cm.getColumnCount(); k++) { cell = row.get(k); fullValue += Ext.isDate(cell) ? cell.format('Y-m-d') : cell; @@ -348,11 +349,11 @@ fullValue += '\n'; } hidden.value = fullValue.replace(/\r/g, ''); - }, this, true); + _mgnlDialogFormSubmit(); + }; hidden._grid = grid; }); // ]]> </script> - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2013-01-28 11:57:14
|
Revision: 4181 http://openutils.svn.sourceforge.net/openutils/?rev=4181&view=rev Author: diego_schivo Date: 2013-01-28 11:57:07 +0000 (Mon, 28 Jan 2013) Log Message: ----------- grid.ftl: fix gridRemoveRow Modified Paths: -------------- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl =================================================================== --- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2013-01-18 17:23:27 UTC (rev 4180) +++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2013-01-28 11:57:07 UTC (rev 4181) @@ -157,7 +157,11 @@ record = new grid.store.recordType(rt); grid.store.add(record); } - grid.selModel.select(c0, c1); + if (c0 < grid.store.data.length) { + grid.selModel.select(c0, c1); + } else if (c0 > 0) { + grid.selModel.select(c0 - 1, c1); + } grid.fireEvent("afteredit", { grid: grid }); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |