Mercurial > lada > lada-client
changeset 1141:e5e4eb249d9c
merged.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Thu, 26 May 2016 14:06:30 +0200 |
| parents | 450368f67858 (current diff) 53d108efab0b (diff) |
| children | 255d550e74f4 |
| files | app/view/grid/Orte.js |
| diffstat | 5 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/app/view/grid/DatensatzErzeuger.js Thu May 26 14:05:36 2016 +0200 +++ b/app/view/grid/DatensatzErzeuger.js Thu May 26 14:06:30 2016 +0200 @@ -69,7 +69,6 @@ sortable: false, width: 30, getClass: function (val, meta, rec) { - console.log(rec.get('statusEdit')); if (rec.get('readonly') === false) { return 'edit'; }
--- a/app/view/grid/MessprogrammKategorie.js Thu May 26 14:05:36 2016 +0200 +++ b/app/view/grid/MessprogrammKategorie.js Thu May 26 14:06:30 2016 +0200 @@ -70,7 +70,6 @@ sortable: false, width: 30, getClass: function (val, meta, rec) { - console.log(rec.get('statusEdit')); if (rec.get('readonly') === false) { return 'edit'; }
--- a/app/view/grid/Orte.js Thu May 26 14:05:36 2016 +0200 +++ b/app/view/grid/Orte.js Thu May 26 14:06:30 2016 +0200 @@ -49,14 +49,13 @@ sortable: false, width: 30, getClass: function (val, meta, rec) { - console.log(rec.get('statusEdit')); if (rec.get('readonly') === false) { return 'edit'; } return 'noedit'; } }, { - header: i18n.getMsg('netzbetreiber'), + header: i18n.getMsg('netzbetreiberId'), renderer: function(value) { var r = ''; if (!value || value === '') { @@ -230,7 +229,9 @@ }, dataIndex: 'latitude' }, { - header: i18n.getMsg('orte.letzteAenderung'), + header: i18n.getMsg('letzteAenderung'), + xtype: 'datecolumn', + format: 'd.m.Y H:i', dataIndex: 'letzteAenderung' }]; this.callParent(arguments);
--- a/app/view/grid/Probenehmer.js Thu May 26 14:05:36 2016 +0200 +++ b/app/view/grid/Probenehmer.js Thu May 26 14:06:30 2016 +0200 @@ -70,7 +70,6 @@ sortable: false, width: 30, getClass: function (val, meta, rec) { - console.log(rec.get('statusEdit')); if (rec.get('readonly') === false) { return 'edit'; }
--- a/resources/i18n/Lada_de-DE.properties Thu May 26 14:05:36 2016 +0200 +++ b/resources/i18n/Lada_de-DE.properties Thu May 26 14:06:30 2016 +0200 @@ -301,7 +301,6 @@ orte.koordYExtern:Y-Koordinate orte.longitude:Geographische Länge orte.latitude:Geographische Breite -orte.letzteAenderung:Zuletzt geändert ##