[Lada-commits] [PATCH 2 of 2] merged heads

[Wald Commits]

# HG changeset patch
# User Dustin Demuth <dustin at intevation.de>
# Date 1436791372 -7200
# Node ID 846e21eaf17a46f501598fe14fa3357e0c0410b0
# Parent  2e81d2ad6af7f8161265e2f730a566aca2d48c2e
# Parent  661ff9a596e0c3132386f4559e10ba8925b2fab6
merged heads

diff -r 2e81d2ad6af7 -r 846e21eaf17a .hgtags
--- a/.hgtags	Mon Jul 13 12:38:31 2015 +0200
+++ b/.hgtags	Mon Jul 13 14:42:52 2015 +0200
@@ -33,3 +33,8 @@
 1ef815f5b9faba8a7a9751db0ce53413816bcdb4 2.0-beta2
 42f7475f3b7dceacfc50688e2b1d548c31c621ec 2.0
 2214aea9fd3a1256d2fde6abe715eb79e6c3c8da 2.0.1
+7bd3afe30ac2527d06e003796d63121f35a50236 2.0.2
+7bd3afe30ac2527d06e003796d63121f35a50236 2.0.2
+0000000000000000000000000000000000000000 2.0.2
+0000000000000000000000000000000000000000 2.0.2
+b90e29b22ea62f1eaa83ae274d1913f42b64bec3 2.0.2
diff -r 2e81d2ad6af7 -r 846e21eaf17a app.js
--- a/app.js	Mon Jul 13 12:38:31 2015 +0200
+++ b/app.js	Mon Jul 13 14:42:52 2015 +0200
@@ -61,7 +61,7 @@
         Lada.userroles = '';
         Lada.logintime = '';
         Lada.mst = [];
-        Lada.clientVersion = '2.0';
+        Lada.clientVersion = '2.0.2';
         Lada.serverVersion = '';
 
         var queryString = document.location.href.split('?')[1];
@@ -169,7 +169,7 @@
     getServerVersion: function() {
         var i18n = Lada.getApplication().bundle;
         Ext.Ajax.request({
-            url: '/lada-server/version',
+            url: 'lada-server/version',
             method: 'GET',
             headers: {
                 'X-OPENID-PARAMS': Lada.openIDParams
diff -r 2e81d2ad6af7 -r 846e21eaf17a app/view/grid/FilterResult.js
--- a/app/view/grid/FilterResult.js	Mon Jul 13 12:38:31 2015 +0200
+++ b/app/view/grid/FilterResult.js	Mon Jul 13 14:42:52 2015 +0200
@@ -166,7 +166,7 @@
                 sortable: false,
                 width: 30,
                 items: [{
-                    icon: '/resources/img/edit-delete.png',
+                    icon: 'resources/img/edit-delete.png',
                     tooltip: 'Löschen',
                     isDisabled: function(grid, rowIndex, colIndex) {
                         var rec = grid.getStore().getAt(rowIndex);