Mercurial > lada > lada-client
diff app.js @ 1007:23bfcbdb4527
merged.
author | Raimund Renkert <raimund.renkert@intevation.de> |
---|---|
date | Wed, 20 Jan 2016 17:33:33 +0100 |
parents | f73ca04d73a7 |
children | 9ac03f461ab4 |
line wrap: on
line diff
--- a/app.js Wed Jan 13 15:29:09 2016 +0100 +++ b/app.js Wed Jan 20 17:33:33 2016 +0100 @@ -63,7 +63,7 @@ Lada.userroles = ''; Lada.logintime = ''; Lada.mst = []; - Lada.clientVersion = '2.1.2'; + Lada.clientVersion = '2.2-STAMMDATEN'; Lada.serverVersion = ''; var queryString = document.location.href.split('?')[1]; @@ -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 @@ -201,7 +201,11 @@ // first before the application "launch" function is called. controllers: [ 'Lada.controller.Filter', - 'Lada.controller.FilterResult', + 'Lada.controller.ModeSwitcher', + 'Lada.controller.grid.ProbeList', + 'Lada.controller.grid.MessprogrammeList', + 'Lada.controller.grid.Datensatzerzeuger', + 'Lada.controller.grid.Probenehmer', 'Lada.controller.form.Probe', 'Lada.controller.form.Messung', 'Lada.controller.form.Ort', @@ -214,7 +218,6 @@ 'Lada.controller.grid.Status', 'Lada.controller.Map', 'Lada.controller.form.Location', - 'Lada.controller.ProbenPlanungSwitcher', 'Lada.controller.form.Messprogramm', 'Lada.controller.grid.Messmethode' ]