Module: check_mk
Branch: master
Commit: 2449b159b928571ef25d0a6e8eba5294f29afdb1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2449b159b92857…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Nov 4 14:01:41 2011 +0100
WATO: fix inventory with 1000 hosts
---
web/htdocs/htmllib.py | 3 ++-
web/htdocs/wato.py | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index 59b0495..68f10a8 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -314,7 +314,8 @@ class html:
def jsbutton(self, varname, text, onclick, style=''):
if style:
style = ' style="%s"' % style
- self.write("<input type=button name=%s id=%s onclick=\"%s\"
class=button%s value=\"%s\" />" % (varname, varname, onclick, style,
text))
+ self.write("<input type=button name=%s id=%s onclick=\"%s\"
"
+ "class=button%s value=\"%s\" />" % (varname,
varname, onclick, style, text))
def begin_context_buttons(self):
self.write("<table class=contextlinks><tr><td>\n")
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index eb17ac5..7308274 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -3174,8 +3174,12 @@ def interactive_progress(items, title, stats, finishvars, timewait,
success_stat
# They are just needed for the Abort/Finish links. Those must be converted
# to POST.
base_url = html.makeuri([], remove_prefix = "sel")
+ finish_url = make_link([("mode", "folder")] + finishvars)
+ term_url = make_link([("mode", "folder")] + termvars)
+
html.javascript(('progress_scheduler("%s", "%s", 50, %s,
"%s", %s, "%s", "' + _("FINISHED.") +
'");') %
- (html.var('mode'), base_url, json_items,
html.makeuri(finishvars), success_stats, html.makeuri(termvars),))
+ (html.var('mode'), base_url, json_items, finish_url,
+ success_stats, term_url))
#.