[Lada-commits] [PATCH 4 of 4] merged

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <raimund.renkert at intevation.de>
# Date 1464264390 -7200
# Node ID e5e4eb249d9c9228453fc0c0003caaa51dc0c7a7
# Parent  450368f678587d29023f00e73615034d7071662c
# Parent  53d108efab0b66701e542ea3ce5e7095bbdc83c4
merged.

diff -r 450368f67858 -r e5e4eb249d9c app/view/grid/DatensatzErzeuger.js
--- 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';
                 }
diff -r 450368f67858 -r e5e4eb249d9c app/view/grid/MessprogrammKategorie.js
--- 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';
                 }
diff -r 450368f67858 -r e5e4eb249d9c app/view/grid/Orte.js
--- 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);
diff -r 450368f67858 -r e5e4eb249d9c app/view/grid/Probenehmer.js
--- 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';
                 }
diff -r 450368f67858 -r e5e4eb249d9c resources/i18n/Lada_de-DE.properties
--- 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
 
 
 ##