comparison 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
comparison
equal deleted inserted replaced
1002:54179b6043b6 1007:23bfcbdb4527
61 launch: function() { 61 launch: function() {
62 Lada.username = ''; 62 Lada.username = '';
63 Lada.userroles = ''; 63 Lada.userroles = '';
64 Lada.logintime = ''; 64 Lada.logintime = '';
65 Lada.mst = []; 65 Lada.mst = [];
66 Lada.clientVersion = '2.1.2'; 66 Lada.clientVersion = '2.2-STAMMDATEN';
67 Lada.serverVersion = ''; 67 Lada.serverVersion = '';
68 68
69 var queryString = document.location.href.split('?')[1]; 69 var queryString = document.location.href.split('?')[1];
70 if (queryString) { 70 if (queryString) {
71 Lada.openIDParams = queryString; 71 Lada.openIDParams = queryString;
72 } 72 }
73 Ext.Ajax.request({ 73 Ext.Ajax.request({
74 url: 'lada-server/user', 74 url: 'lada-server/rest/user',
75 method: 'GET', 75 method: 'GET',
76 scope: this, 76 scope: this,
77 success: this.onLoginSuccess, 77 success: this.onLoginSuccess,
78 failure: this.onLoginFailure 78 failure: this.onLoginFailure
79 }); 79 });
177 }, 177 },
178 178
179 getServerVersion: function() { 179 getServerVersion: function() {
180 var i18n = Lada.getApplication().bundle; 180 var i18n = Lada.getApplication().bundle;
181 Ext.Ajax.request({ 181 Ext.Ajax.request({
182 url: 'lada-server/version', 182 url: 'lada-server/rest/version',
183 method: 'GET', 183 method: 'GET',
184 headers: { 184 headers: {
185 'X-OPENID-PARAMS': Lada.openIDParams 185 'X-OPENID-PARAMS': Lada.openIDParams
186 }, 186 },
187 success: function(response) { 187 success: function(response) {
199 199
200 // Define the controllers of the application. They will be initialized 200 // Define the controllers of the application. They will be initialized
201 // first before the application "launch" function is called. 201 // first before the application "launch" function is called.
202 controllers: [ 202 controllers: [
203 'Lada.controller.Filter', 203 'Lada.controller.Filter',
204 'Lada.controller.FilterResult', 204 'Lada.controller.ModeSwitcher',
205 'Lada.controller.grid.ProbeList',
206 'Lada.controller.grid.MessprogrammeList',
207 'Lada.controller.grid.Datensatzerzeuger',
208 'Lada.controller.grid.Probenehmer',
205 'Lada.controller.form.Probe', 209 'Lada.controller.form.Probe',
206 'Lada.controller.form.Messung', 210 'Lada.controller.form.Messung',
207 'Lada.controller.form.Ort', 211 'Lada.controller.form.Ort',
208 'Lada.controller.grid.Ort', 212 'Lada.controller.grid.Ort',
209 'Lada.controller.grid.Probenzusatzwert', 213 'Lada.controller.grid.Probenzusatzwert',
212 'Lada.controller.grid.Messung', 216 'Lada.controller.grid.Messung',
213 'Lada.controller.grid.Messwert', 217 'Lada.controller.grid.Messwert',
214 'Lada.controller.grid.Status', 218 'Lada.controller.grid.Status',
215 'Lada.controller.Map', 219 'Lada.controller.Map',
216 'Lada.controller.form.Location', 220 'Lada.controller.form.Location',
217 'Lada.controller.ProbenPlanungSwitcher',
218 'Lada.controller.form.Messprogramm', 221 'Lada.controller.form.Messprogramm',
219 'Lada.controller.grid.Messmethode' 222 'Lada.controller.grid.Messmethode'
220 ] 223 ]
221 }); 224 });

http://lada.wald.intevation.org