# HG changeset patch
# User Dustin Demuth <dustin@intevation.de>
# Date 1431505635 -7200
# Node ID 442e7bd290dc39f24aee77779b5a5fd0f2216ffe
# Parent  d2ee6858f45285c1948279d5e7bbf60af1f7a47f# Parent  bb2593ca23e8cbad874a5d75c4d804cda202ff7b
merged heads

diff -r bb2593ca23e8 -r 442e7bd290dc app/controller/grid/Messmethode.js
--- a/app/controller/grid/Messmethode.js	Wed May 13 10:23:57 2015 +0200
+++ b/app/controller/grid/Messmethode.js	Wed May 13 10:27:15 2015 +0200
@@ -211,7 +211,7 @@
         //Create an empty Messgroessen Store which will be populated with the
         //Messgroessen defined in the Messmethoden record.
         var mmtmessgroessenstore = Ext.create('Ext.data.Store', {
-            model: 'Lada.model.Messgroesse',
+            model: 'Lada.model.Messgroesse'
         });
 
         // Copy every Record from Messgroessenstore to the empty Store
diff -r bb2593ca23e8 -r 442e7bd290dc app/store/Probenintervall.js
--- a/app/store/Probenintervall.js	Wed May 13 10:23:57 2015 +0200
+++ b/app/store/Probenintervall.js	Wed May 13 10:27:15 2015 +0200
@@ -64,10 +64,10 @@
     }],
     sorters: [{
         property: 'periodend',
-        direction: 'DESC',
+        direction: 'DESC'
     }],
     sortOnLoad: true,
-    remoteSort: false,
+    remoteSort: false
 });
 
 function translateStore(v, record){
diff -r bb2593ca23e8 -r 442e7bd290dc app/store/Umwelt.js
--- a/app/store/Umwelt.js	Wed May 13 10:23:57 2015 +0200
+++ b/app/store/Umwelt.js	Wed May 13 10:27:15 2015 +0200
@@ -27,5 +27,5 @@
     }],
     sortOnLoad: true,
     remoteSort: false,
-    autoLoad: true,
+    autoLoad: true
 });
diff -r bb2593ca23e8 -r 442e7bd290dc app/view/form/Messprogramm.js
--- a/app/view/form/Messprogramm.js	Wed May 13 10:23:57 2015 +0200
+++ b/app/view/form/Messprogramm.js	Wed May 13 10:27:15 2015 +0200
@@ -261,7 +261,7 @@
                             fieldLabel: i18n.getMsg('offset'),
                             labelWidth: 90,
                             anchor: '100%',
-                            name: 'intervallOffset',
+                            name: 'intervallOffset'
                         }]
                     }, {
                         xtype: 'fset',
@@ -299,7 +299,7 @@
                             fieldLabel: i18n.getMsg('intervall'),
                             labelWidth: 90,
                             anchor: '100%',
-                            values: [0, 0],
+                            values: [0, 0]
                                 //this will be overridden
                                 // by setRecord
                         }]
diff -r bb2593ca23e8 -r 442e7bd290dc app/view/grid/Messmethoden.js
--- a/app/view/grid/Messmethoden.js	Wed May 13 10:23:57 2015 +0200
+++ b/app/view/grid/Messmethoden.js	Wed May 13 10:27:15 2015 +0200
@@ -62,7 +62,7 @@
                 text: i18n.getMsg('add'),
                 icon: 'resources/img/list-add.png',
                 action: 'add',
-                recordId: this.recordId,
+                recordId: this.recordId
             }, {
                 text: i18n.getMsg('delete'),
                 icon: 'resources/img/list-remove.png',
@@ -100,7 +100,7 @@
                     '<tpl for="."><div class="x-combo-list-item  x-boundlist-item" >' +
                     '{id} - {messmethode}</div></tpl>'),
                 displayTpl: Ext.create('Ext.XTemplate',
-                    '<tpl for=".">{id} - {messmethode}</tpl>'),
+                    '<tpl for=".">{id} - {messmethode}</tpl>')
             }
         }];
         this.initData();
diff -r bb2593ca23e8 -r 442e7bd290dc app/view/grid/Nuklide.js
--- a/app/view/grid/Nuklide.js	Wed May 13 10:23:57 2015 +0200
+++ b/app/view/grid/Nuklide.js	Wed May 13 10:27:15 2015 +0200
@@ -80,7 +80,7 @@
                     '<tpl for="."><div class="x-combo-list-item  x-boundlist-item" >' +
                     '{messgroesse}</div></tpl>'),
                 displayTpl: Ext.create('Ext.XTemplate',
-                    '<tpl for=".">{messgroesse}</tpl>'),
+                    '<tpl for=".">{messgroesse}</tpl>')
             }
         }];
 
diff -r bb2593ca23e8 -r 442e7bd290dc app/view/widget/Betriebsart.js
--- a/app/view/widget/Betriebsart.js	Wed May 13 10:23:57 2015 +0200
+++ b/app/view/widget/Betriebsart.js	Wed May 13 10:27:15 2015 +0200
@@ -15,7 +15,7 @@
     }, {
         'betriebsartId': '2',
         'betriebsart': 'Störfall/Intensivbetrieb'
-    }],
+    }]
 });
 
 /**