Checkmk git commits August 2011

checkmk-commits@lists.checkmk.com

3 participants
272 discussions

Check_MK Git: check_mk: FIX: Removed new python syntax which is incompatible with old python versions

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e136cefc54789cc7b454ab9614104d72254d4b7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e136cefc54789c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 10:15:59 2011 +0200 FIX: Removed new python syntax which is incompatible with old python versions --- ChangeLog | 1 + web/htdocs/views.py | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a9b88e..4d18dd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Multisite: * FIX: WATO filtered status GUIs did not update the title after changing the title of the file/folder in WATO + * FIX: Removed new python syntax which is incompatible with old python versions 1.1.11i3: Core, Setup, etc.: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 56efde2..f4153f5 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1162,7 +1162,10 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru query = filterheaders + view.get("add_headers", "") # [4] Sorting - use view sorters or url supplied sorters - sorter_list = parse_url_sorters(html.var('sort')) if html.has_var('sort') else view["sorters"] + if html.has_var('sort'): + sorter_list = parse_url_sorters(html.var('sort')) + else: + sorter_list = view["sorters"] sorters = [ (multisite_sorters[sn], reverse) for sn, reverse in sorter_list ] # [5] Grouping @@ -2297,7 +2300,7 @@ def sort_url(view, painter): # Now add the sorter as primary user sorter sorter = group_sort + [this_asc_sorter] + user_sort + view_sort - return ','.join([ ('-' if s[1] else '') + s[0] for s in sorter ]) + return ','.join([ (s[1] and '-' or '') + s[0] for s in sorter ]) def paint_header(view, p): painter = p[0] @@ -2400,8 +2403,8 @@ def declare_1to1_sorter(painter_name, func, col_num = 0, reverse = False): "title" : multisite_painters[painter_name]['title'], "columns" : multisite_painters[painter_name]['columns'], "cmp" : lambda r1, r2: func(multisite_painters[painter_name]['columns'][col_num], - r1 if reverse else r2, - r2 if reverse else r1) + reverse and r1 or r2, + reverse and r2 or r1) } return painter_name

13 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk into reload

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e523ae29a26fb04f638bacaf7cb34899c4160b1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e523ae29a26fb0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 24 14:10:14 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk into reload ---

13 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk into reload

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8be6550d6720eab608d6778a5cc9ebf31e6ea27c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8be6550d6720ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 24 15:39:50 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk into reload ---

13 years, 1 month

Check_MK Git: check_mk: Processing <script> tags on page reload now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ebbc18166066e6e219baea144da8d3d94579fac4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebbc18166066e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 24 17:11:04 2011 +0200 Processing <script> tags on page reload now --- web/htdocs/js/check_mk.js | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 58155de..d8246e0 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -611,6 +611,25 @@ function startReloadTimer(url) { function handleContentReload(_unused, code) { var o = document.getElementById('data_container'); o.innerHTML = code; + + // Need to fix javascript execution in innerHTML + var aScripts = o.getElementsByTagName('script'); + for(var i in aScripts) { + if(aScripts[i].src && aScripts[i].src !== '') { + var oScr = document.createElement('script'); + oScr.src = aScripts[i].src; + document.body.appendChild(oScr); + oScr = null; + } else { + try { + eval(aScripts[i].text); + } catch(e) { + alert(" Script error: " + aScripts[i].text); + } + } + } + + aScripts = null; o = null; startReloadTimer(''); }

13 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk into reload

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 469c67be8adbbb04ab48df3e8facd531dfa5726a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=469c67be8adbbb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 24 15:48:34 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk into reload ---

13 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk into reload

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 97c4b6615e737c1452555557e4c0200d52dcca8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97c4b6615e737c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 24 17:14:55 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk into reload Conflicts: ChangeLog ---

13 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk into reload

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 97c1cff30cfdc436d0b57c05e1e827b358cb9e19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97c1cff30cfdc4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 08:28:20 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk into reload ---

13 years, 1 month

Check_MK Git: check_mk: Merge branch 'reload' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9312ba2097553a608de2e565cb71147dde37685d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9312ba2097553a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 25 10:00:03 2011 +0200 Merge branch 'reload' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 1 month

Check_MK Git: check_mk: view Reload: Not setting display_options param when empty

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7467c81261983daa35530349197247529ac6324c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7467c81261983d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 24 13:33:34 2011 +0200 view Reload: Not setting display_options param when empty --- ChangeLog | 2 ++ web/htdocs/js/check_mk.js | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0b0acc..2e4a9ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,8 @@ * Added several missing i18n strings in view editor * Views can now be sorted by the users by clicking on the table headers. The user sort options are not persisted. + * Views are not reloaded completely anymore. The data tables are reloaded + on their own. WATO: * Show error message in case of empty inventory due to agent error diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 393479f..58155de 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -636,8 +636,12 @@ function handleReload(url) { } opts = null; - var url = makeuri({'_display_options': display_options, - 'display_options': getUrlParam('display_options')}); + var params = {'_display_options': display_options}; + var real_display_options = getUrlParam('display_options'); + if(real_display_options !== '') + params['display_options'] = real_display_options; + + var url = makeuri(params); display_options = null; get_url(url, handleContentReload, ''); url = null;

13 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' into reload

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d05e4250fe96ffe1e6a93667071d1a14afa2b913 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d05e4250fe96ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 24 13:17:34 2011 +0200 Merge branch 'master' into reload ---

13 years, 1 month

← Newer
1
2
3
4
5
6
7
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2011