Mercurial > lada > lada-client

changeset 999:f73ca04d73a7 stammdatengrids

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactored Server URL
author Dustin Demuth <dustin@intevation.de>
date Wed, 13 Jan 2016 14:50:28 +0100
parents b21421ba6917
children 15d8c64049d1
files app.js app/controller/FilterResult.js app/controller/grid/ProbeList.js app/model/Datenbasis.js app/model/DatensatzErzeuger.js app/model/Deskriptor.js app/model/Location.js app/model/MKommentar.js app/model/Messeinheit.js app/model/Messmethode.js app/model/Messprogramm.js app/model/MessprogrammKategorie.js app/model/MessprogrammList.js app/model/Messstelle.js app/model/Messung.js app/model/Messwert.js app/model/MmtMessprogramm.js app/model/Netzbetreiber.js app/model/Ort.js app/model/PKommentar.js app/model/Pflichtmessgroesse.js app/model/Probe.js app/model/ProbeList.js app/model/Probenart.js app/model/Probenehmer.js app/model/Probenzusatz.js app/model/Staat.js app/model/Status.js app/model/StatusStufe.js app/model/StatusWerte.js app/model/Umwelt.js app/model/Verwaltungseinheit.js app/model/Zusatzwert.js app/store/Messgroessen.js app/store/MessprogrammQueries.js app/store/ProbeQueries.js app/store/StammdatenQueries.js app/view/window/DeleteProbe.js app/view/window/FileUpload.js app/view/window/GenProbenFromMessprogramm.js
diffstat 40 files changed, 42 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/app.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app.js	Wed Jan 13 14:50:28 2016 +0100
@@ -71,7 +71,7 @@
             Lada.openIDParams = queryString;
         }
         Ext.Ajax.request({
-            url: 'lada-server/user',
+            url: 'lada-server/rest/user',
             method: 'GET',
             scope: this,
             success: this.onLoginSuccess,
@@ -179,7 +179,7 @@
     getServerVersion: function() {
         var i18n = Lada.getApplication().bundle;
         Ext.Ajax.request({
-            url: 'lada-server/version',
+            url: 'lada-server/rest/version',
             method: 'GET',
             headers: {
                 'X-OPENID-PARAMS': Lada.openIDParams
--- a/app/controller/FilterResult.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/controller/FilterResult.js	Wed Jan 13 14:50:28 2016 +0100
@@ -171,7 +171,7 @@
         }
         var me = this;
         Ext.Ajax.request({
-            url: 'lada-server/export/laf',
+            url: 'lada-server/data/export/laf',
             jsonData: {'proben': proben},
             success: function(response) {
                 var content = response.responseText;
--- a/app/controller/grid/ProbeList.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/controller/grid/ProbeList.js	Wed Jan 13 14:50:28 2016 +0100
@@ -101,7 +101,7 @@
         }
         var me = this;
         Ext.Ajax.request({
-            url: 'lada-server/export/laf',
+            url: 'lada-server/data/export/laf',
             jsonData: {'proben': proben},
             success: function(response) {
                 var content = response.responseText;
--- a/app/model/Datenbasis.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Datenbasis.js	Wed Jan 13 14:50:28 2016 +0100
@@ -30,7 +30,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/datenbasis',
+        url: 'lada-server/rest/datenbasis',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/DatensatzErzeuger.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/DatensatzErzeuger.js	Wed Jan 13 14:50:28 2016 +0100
@@ -53,7 +53,7 @@
 
     proxy: {
         type: 'memory',
-        //url: 'lada-server/datensatzerzeuger',
+        //url: 'lada-server/rest/datensatzerzeuger',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Deskriptor.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Deskriptor.js	Wed Jan 13 14:50:28 2016 +0100
@@ -26,7 +26,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/deskriptor',
+        url: 'lada-server/rest/deskriptor',
         reader: {
             type: 'json',
             root: 'data',
--- a/app/model/Location.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Location.js	Wed Jan 13 14:50:28 2016 +0100
@@ -55,7 +55,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/location',
+        url: 'lada-server/rest/location',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/MKommentar.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/MKommentar.js	Wed Jan 13 14:50:28 2016 +0100
@@ -42,7 +42,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/mkommentar',
+        url: 'lada-server/rest/mkommentar',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Messeinheit.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Messeinheit.js	Wed Jan 13 14:50:28 2016 +0100
@@ -36,7 +36,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/messeinheit',
+        url: 'lada-server/rest/messeinheit',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Messmethode.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Messmethode.js	Wed Jan 13 14:50:28 2016 +0100
@@ -37,7 +37,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/messmethode',
+        url: 'lada-server/rest/messmethode',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Messprogramm.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Messprogramm.js	Wed Jan 13 14:50:28 2016 +0100
@@ -132,7 +132,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/messprogramm', //not yet implemented
+        url: 'lada-server/rest/messprogramm',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/MessprogrammKategorie.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/MessprogrammKategorie.js	Wed Jan 13 14:50:28 2016 +0100
@@ -51,7 +51,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/messprogrammkategorie',
+        url: 'lada-server/rest/messprogrammkategorie',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/MessprogrammList.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/MessprogrammList.js	Wed Jan 13 14:50:28 2016 +0100
@@ -21,7 +21,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/messprogramm',
+        url: 'lada-server/rest/messprogramm',
         reader: {
             type: 'json',
             root: 'data',
--- a/app/model/Messstelle.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Messstelle.js	Wed Jan 13 14:50:28 2016 +0100
@@ -39,7 +39,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/messstelle',
+        url: 'lada-server/rest/messstelle',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Messung.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Messung.js	Wed Jan 13 14:50:28 2016 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz
+* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz
  * Software engineering by Intevation GmbH
  *
  * This file is Free Software under the GNU GPL (v>=3)
@@ -82,7 +82,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/messung',
+        url: 'lada-server/rest/messung',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Messwert.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Messwert.js	Wed Jan 13 14:50:28 2016 +0100
@@ -72,7 +72,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/messwert',
+        url: 'lada-server/rest/messwert',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/MmtMessprogramm.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/MmtMessprogramm.js	Wed Jan 13 14:50:28 2016 +0100
@@ -37,7 +37,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/messprogrammmmt',
+        url: 'lada-server/rest/messprogrammmmt',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Netzbetreiber.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Netzbetreiber.js	Wed Jan 13 14:50:28 2016 +0100
@@ -42,7 +42,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/netzbetreiber',
+        url: 'lada-server/rest/netzbetreiber',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Ort.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Ort.js	Wed Jan 13 14:50:28 2016 +0100
@@ -60,7 +60,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/ort',
+        url: 'lada-server/rest/ort',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/PKommentar.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/PKommentar.js	Wed Jan 13 14:50:28 2016 +0100
@@ -42,7 +42,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/pkommentar',
+        url: 'lada-server/rest/pkommentar',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Pflichtmessgroesse.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Pflichtmessgroesse.js	Wed Jan 13 14:50:28 2016 +0100
@@ -36,7 +36,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/pflichtmessgroesse',
+        url: 'lada-server/rest/pflichtmessgroesse',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Probe.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Probe.js	Wed Jan 13 14:50:28 2016 +0100
@@ -141,7 +141,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/probe',
+        url: 'lada-server/rest/probe',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/ProbeList.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/ProbeList.js	Wed Jan 13 14:50:28 2016 +0100
@@ -23,7 +23,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/probe',
+        url: 'lada-server/rest/probe',
         reader: {
             type: 'json',
             root: 'data',
--- a/app/model/Probenart.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Probenart.js	Wed Jan 13 14:50:28 2016 +0100
@@ -33,7 +33,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/probenart',
+        url: 'lada-server/rest/probenart',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Probenehmer.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Probenehmer.js	Wed Jan 13 14:50:28 2016 +0100
@@ -69,7 +69,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/messprogrammkategorie',
+        url: 'lada-server/rest/probenehmer',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Probenzusatz.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Probenzusatz.js	Wed Jan 13 14:50:28 2016 +0100
@@ -44,7 +44,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/probenzusatz',
+        url: 'lada-server/rest/probenzusatz',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Staat.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Staat.js	Wed Jan 13 14:50:28 2016 +0100
@@ -27,7 +27,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/staat',
+        url: 'lada-server/rest/staat',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Status.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Status.js	Wed Jan 13 14:50:28 2016 +0100
@@ -66,7 +66,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/status',
+        url: 'lada-server/rest/status',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/StatusStufe.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/StatusStufe.js	Wed Jan 13 14:50:28 2016 +0100
@@ -23,7 +23,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/statusstufe',
+        url: 'lada-server/rest/statusstufe',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/StatusWerte.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/StatusWerte.js	Wed Jan 13 14:50:28 2016 +0100
@@ -23,7 +23,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/statuswert',
+        url: 'lada-server/rest/statuswert',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Umwelt.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Umwelt.js	Wed Jan 13 14:50:28 2016 +0100
@@ -33,7 +33,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/umwelt',
+        url: 'lada-server/rest/umwelt',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Verwaltungseinheit.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Verwaltungseinheit.js	Wed Jan 13 14:50:28 2016 +0100
@@ -57,7 +57,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/verwaltungseinheit',
+        url: 'lada-server/rest/verwaltungseinheit',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/model/Zusatzwert.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/model/Zusatzwert.js	Wed Jan 13 14:50:28 2016 +0100
@@ -66,7 +66,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/zusatzwert',
+        url: 'lada-server/rest/zusatzwert',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/store/Messgroessen.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/store/Messgroessen.js	Wed Jan 13 14:50:28 2016 +0100
@@ -26,7 +26,7 @@
 
     proxy: {
         type: 'rest',
-        url: 'lada-server/messgroesse',
+        url: 'lada-server/rest/messgroesse',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/store/MessprogrammQueries.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/store/MessprogrammQueries.js	Wed Jan 13 14:50:28 2016 +0100
@@ -15,7 +15,7 @@
     autoLoad: true,
     proxy: {
         type: 'rest',
-        url: 'lada-server/query/messprogramm',
+        url: 'lada-server/rest/query/messprogramm',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/store/ProbeQueries.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/store/ProbeQueries.js	Wed Jan 13 14:50:28 2016 +0100
@@ -15,7 +15,7 @@
     autoLoad: true,
     proxy: {
         type: 'rest',
-        url: 'lada-server/query/probe',
+        url: 'lada-server/rest/query/probe',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/store/StammdatenQueries.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/store/StammdatenQueries.js	Wed Jan 13 14:50:28 2016 +0100
@@ -19,7 +19,7 @@
         ]},*/
     proxy: {
         type: 'rest',
-        url: 'lada-server/query/stammdaten',
+        url: 'lada-server/rest/query/stammdaten',
         reader: {
             type: 'json',
             root: 'data'
--- a/app/view/window/DeleteProbe.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/view/window/DeleteProbe.js	Wed Jan 13 14:50:28 2016 +0100
@@ -50,8 +50,7 @@
             handler: function() {
 
                 Ext.Ajax.request({
-                    //TODO Use correct URLs
-                    url: 'lada-server/probe/'+me.record.get('id'),
+                    url: 'lada-server/rest/probe/'+me.record.get('id'),
                     method: 'DELETE',
                     success: function(response) {
                         var json = Ext.JSON.decode(response.responseText);
--- a/app/view/window/FileUpload.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/view/window/FileUpload.js	Wed Jan 13 14:50:28 2016 +0100
@@ -82,7 +82,7 @@
                 'X-OPENID-PARAMS': Lada.openIDParams
             },
             method: 'POST',
-            url: 'lada-server/import/laf'
+            url: 'lada-server/data/import/laf'
         });
         this.mon(uploader, 'uploadsuccess', win.uploadSuccess, win);
         this.mon(uploader, 'uploadfailure', win.uploadFailure, win);
--- a/app/view/window/GenProbenFromMessprogramm.js	Thu Dec 10 08:30:14 2015 +0100
+++ b/app/view/window/GenProbenFromMessprogramm.js	Wed Jan 13 14:50:28 2016 +0100
@@ -56,7 +56,7 @@
 
 
                 Ext.Ajax.request({
-                    url: 'lada-server/probe/messprogramm',
+                    url: 'lada-server/rest/probe/messprogramm',
                     method: 'POST',
                     jsonData: jsondata,
                     success: function(response) {
http://lada.wald.intevation.org