26 Apr
2013
26 Apr
'13
1:56 p.m.
Module: check_mk
Branch: master
Commit: 227c12d110c9d9e8d95ee18e797a17b241509cda
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=227c12d110c9d9…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Apr 26 13:55:42 2013 +0200
FIX: titles and services got lost when moving join-columns in views
Conflicts:
web/htdocs/js/checkmk.js
---
ChangeLog | 1 +
web/htdocs/js/checkmk.js | 4 ++--
web/htdocs/views.py | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ec31bb4..20ea97a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -122,6 +122,7 @@
a deletion of users' settings in case of an external authentication
(like mod_ldap).
* FIX: Fixed handling of dashboards without title in sidebar view snapin
+ * FIX: titles and services got lost when moving join-columns in views
WATO:
* Improved handling of valuespec validations in WATO rule editor. Displaying a
diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js
index 1fce61f..82c5f5a 100644
--- a/web/htdocs/js/checkmk.js
+++ b/web/htdocs/js/checkmk.js
@@ -634,9 +634,9 @@ function column_swap_ids(o1, o2) {
var type = parts[0];
var num1 = parts[2];
var num2 = o2.id.split('_')[2];
-
+
var o1 = null, o2 = null;
- var objects = [ '', '_editor', '_up', '_down',
'_link', '_tooltip' ];
+ var objects = [ '', '_editor', '_up', '_down',
'_link', '_tooltip', '_label', '_title',
'_join_index' ];
for(var i = 0,len = objects.length; key = type+objects[i]+'_', i < len;
i++) {
o1 = document.getElementById(key + num1);
o2 = document.getElementById(key + num2);
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 4425beb..516ec34 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -768,14 +768,14 @@ def view_edit_column(n, var_prefix, maxnum, allowed, joined = []):
display = ''
html.write("</td></tr><tr id='%sjoin_index_row%d'
style='display:%s'><td class=celeft>%s:</td><td>" %
(var_prefix, n,
display, _('of Service')))
- html.text_input("%sjoin_index_%d" % (var_prefix, n))
+ html.text_input("%sjoin_index_%d" % (var_prefix, n), id = var_prefix +
"join_index_%d" % n)
html.write("</td></tr><tr><td
class=celeft>%s:</td><td>" % _('Link'))
select_view("%slink_%d" % (var_prefix, n))
html.write("</td></tr><tr><td
class=celeft>%s:</td><td>" % _('Tooltip'))
html.select("%stooltip_%d" % (var_prefix, n), collist)
html.write("</td></tr><tr id='%stitle_row%d'
style='display:%s'><td class=celeft>%s:</td><td>" %
(var_prefix, n,
display, _('Title')))
- html.text_input("%stitle_%d" % (var_prefix, n))
+ html.text_input("%stitle_%d" % (var_prefix, n), id = var_prefix +
"title_%d" % n)
html.write("</td></tr></table>")
html.write("</div>")