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

[Wald Commits]

# HG changeset patch
# User Torsten Irländer <torsten.irlaender at intevation.de>
# Date 1386066567 -3600
# Node ID 52d9af2cf6f1742f8aba64c6b1001a2c1fffa021
# Parent  0ab89a3b90906dd92eb1c6ee185ef545d53e9a3d
# Parent  d900db3e9be91df697cb6ccf64fa936fb865adcf
Merged

diff -r 0ab89a3b9090 -r 52d9af2cf6f1 .hgtags
--- a/.hgtags	Tue Dec 03 11:24:13 2013 +0100
+++ b/.hgtags	Tue Dec 03 11:29:27 2013 +0100
@@ -16,3 +16,5 @@
 f4185f2d1a7ca10b5f04c6c819f1771513b9d99b 0.9
 f4185f2d1a7ca10b5f04c6c819f1771513b9d99b 0.9
 759828c533f54455fd18106a67c2a46256b2dc90 0.9
+759828c533f54455fd18106a67c2a46256b2dc90 0.9
+1fc4407c6c8372cb024e673c8ece3dd508b457e3 0.9
diff -r 0ab89a3b9090 -r 52d9af2cf6f1 app/model/Probe.js
--- a/app/model/Probe.js	Tue Dec 03 11:24:13 2013 +0100
+++ b/app/model/Probe.js	Tue Dec 03 11:29:27 2013 +0100
@@ -10,8 +10,6 @@
         {name: "datenbasisId"},
         {name: "erzeugerId"},
         {name: "hauptprobenNr"},
-        {name: "messmethode"},
-        {name: "nebenprobenNr"},
         {name: "letzteAenderung", type: 'date', convert: Lada.lib.Helpers.ts2date, defaultValue: new Date()},
         {name: "media"},
         {name: "mediaDesk"},