Mercurial > lada > lada-client
comparison app/view/grid/Status.js @ 636:f4f76fc04e28
merged.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Mon, 16 Mar 2015 17:32:15 +0100 |
| parents | 73b5b22a5b76 |
| children | 1c5a4b419149 |
comparison
equal
deleted
inserted
replaced
| 635:def8def373e8 | 636:f4f76fc04e28 |
|---|---|
| 92 allowBlank: false | 92 allowBlank: false |
| 93 } | 93 } |
| 94 }, { | 94 }, { |
| 95 header: 'Datum', | 95 header: 'Datum', |
| 96 dataIndex: 'sdatum', | 96 dataIndex: 'sdatum', |
| 97 xtype: 'datecolumn', | |
| 98 format: 'd.m.Y H:i', | |
| 97 editor: { | 99 editor: { |
| 98 xtype: 'datefield', | 100 xtype: 'datefield', |
| 99 allowBlank: false, | 101 allowBlank: false, |
| 100 format: 'd.m.Y', | 102 format: 'd.m.Y H:i', |
| 101 maxValue: Ext.Date.format(new Date(), 'd.m.Y') | 103 maxValue: Ext.Date.format(new Date(), 'd.m.Y') |
| 102 } | 104 } |
| 103 }, { | 105 }, { |
| 104 header: 'Text', | 106 header: 'Text', |
| 105 dataIndex: 'skommentar', | 107 dataIndex: 'skommentar', |