From: <die...@us...> - 2011-10-27 10:44:15
|
Revision: 3677 http://openutils.svn.sourceforge.net/openutils/?rev=3677&view=rev Author: diego_schivo Date: 2011-10-27 10:44:06 +0000 (Thu, 27 Oct 2011) Log Message: ----------- gridDeleteRow Modified Paths: -------------- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl =================================================================== --- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2011-10-27 10:29:26 UTC (rev 3676) +++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2011-10-27 10:44:06 UTC (rev 3677) @@ -126,65 +126,37 @@ } } -function gridInsertRow(grid, expand) { +function gridInsertRow(grid, fixedRows) { if (grid.selModel.selection) { - var j = grid.selModel.selection.cell[0], k, K = grid.colModel.getColumnCount(), rt = {}, record; + var c0 = grid.selModel.selection.cell[0], c1 = grid.selModel.selection.cell[1], k, K = grid.colModel.getColumnCount(), rt, record; + rt = {}; for (k = 0; k < K; k++) { rt[''+k] = ''; } - k = grid.selModel.selection.cell[1]; - if (!expand) { + if (fixedRows) { record = grid.store.getAt(grid.store.data.length - 1); grid.store.remove(record); } record = new grid.store.recordType(rt); - grid.store.insert(j, record); - grid.selModel.select(j, k); + grid.store.insert(c0, record); + grid.selModel.select(c0, c1); } } -function gridDeleteRow(grid) { +function gridDeleteRow(grid, fixedRows) { if (grid.selModel.selection) { - var dat = grid.store.data, r1, r2, j1, j2, k, K = grid.colModel.getColumnCount(), field, e1, e2; - for (j1 = grid.selModel.selection.cell[0]; j1 < dat.length - 2; j1++) { - j2 = j1 + 1; - r1 = grid.store.getAt(j1); - r2 = grid.store.getAt(j2); + var c0 = grid.selModel.selection.cell[0], c1 = grid.selModel.selection.cell[1], k, K = grid.colModel.getColumnCount(), rt, record; + record = grid.store.getAt(c0); + grid.store.remove(record); + if (fixedRows) { + rt = {}; for (k = 0; k < K; k++) { - field = grid.colModel.getDataIndex(k); - e1 = { - grid: grid, - record: r1, - field: field, - originalValue: r1.data[field], - value: r2.data[field], - row: j1, - column: k, - cancel: false - }; - e2 = { - grid: grid, - record: r2, - field: field, - originalValue: r2.data[field], - value: '', - row: j2, - column: k, - cancel: false - }; - if(grid.fireEvent("validateedit", e1) !== false && !e1.cancel && grid.fireEvent("validateedit", e2) !== false && !e2.cancel){ - r1.set(field, e1.value); - delete e1.cancel; - grid.fireEvent("afteredit", e1); - - r2.set(field, e2.value); - delete e2.cancel; - grid.fireEvent("afteredit", e2); - - grid.selModel.select(j2, grid.selModel.selection.cell[1]); - } + rt[''+k] = ''; } + record = new grid.store.recordType(rt); + grid.store.add(record); } + grid.selModel.select(c0, c1); } } @@ -328,7 +300,7 @@ icon: '${request.contextPath}/.resources/controls/img/icon-add.png', iconCls: 'button-insert-row', handler: function() { - gridInsertRow(grid, ${addRowsEnabled?string}); + gridInsertRow(grid, ${(!addRowsEnabled)?string}); } }, { text: '', @@ -336,7 +308,7 @@ icon: '${request.contextPath}/.resources/controls/img/icon-delete.png', iconCls: 'button-delete-row', handler: function() { - gridDeleteRow(grid); + gridDeleteRow(grid, ${(!addRowsEnabled)?string}); } }], [#if (configuration.height??)] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |