Module: check_mk
Branch: master
Commit: 427e75d9be1312b7b12ec575667b1379c2071bdd
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=427e75d9be1312…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Nov 4 13:43:35 2011 +0100
Revert "Multisite: renamed filled_in with _filled_in"
This breaks view reloading algorithm.
This reverts commit 454886fc4c5b1afa4e4ca4bff243c26c0e6bb9d3.
---
web/htdocs/dashboard.py | 2 +-
web/htdocs/htmllib.py | 16 ++++++++--------
web/htdocs/js/search.js | 2 +-
web/htdocs/views.py | 4 ++--
web/plugins/views/bi.py | 4 ++--
web/plugins/views/filters.py | 12 ++++++------
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py
index a4ad616..f9f9682 100644
--- a/web/htdocs/dashboard.py
+++ b/web/htdocs/dashboard.py
@@ -518,7 +518,7 @@ def render_statistics(pie_id, what, table, filter):
html.write('<table class="hoststats%s" style="float:left">' % (
len(pies) > 5 and " narrow" or ""))
for (name, color, viewurl, query), count in pies + [ ((_("Total"), "", "all%s" % what, ""), total) ]:
- url = "view.py?view_name=" + viewurl + "&_filled_in=filter&search=1&wato_folder=" \
+ url = "view.py?view_name=" + viewurl + "&filled_in=filter&search=1&wato_folder=" \
+ htmllib.urlencode(html.var("wato_folder", ""))
html.write('<tr><th><a href="%s">%s</a></th>' % (url, name))
html.write('<td class=color style="background-color: %s">'
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index 5a7c0f3..59b0495 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -233,7 +233,7 @@ class html:
onsubmit = ''
self.write("<form name=%s class=%s action=\"%s\" method=%s%s%s>\n" %
(name, name, action, method, enctype, onsubmit))
- self.hidden_field("_filled_in", name)
+ self.hidden_field("filled_in", name)
self.hidden_field("_transid", str(self.current_transid()))
self.hidden_fields(self.global_vars)
self.form_name = name
@@ -242,7 +242,7 @@ class html:
self.write("</form>\n")
def form_submitted(self):
- return self.has_var("_filled_in")
+ return self.has_var("filled_in")
def add_user_error(self, varname, message):
if type(varname) == list:
@@ -415,10 +415,10 @@ class html:
html = "<x class=inputerror>"
# Problem with checkboxes: The browser will add the variable
# only to the URL if the box is checked. So in order to detect
- # whether we should add the default value, we need to detect
+ # wether we should add the default value, we need to detect
# if the form is printed for the first time. This is the
- # case if "_filled_in" is not set.
- if not self.var("_filled_in") == self.form_name: # this form filled in
+ # case if "filled_in" is not set.
+ if not self.var("filled_in") == self.form_name: # this form filled in
value = self.req.vars.get(varname, deflt)
else:
value = self.req.vars.get(varname, "")
@@ -443,13 +443,13 @@ class html:
def get_checkbox(self, varname, form_name = None):
if form_name:
try:
- if not self.var("_filled_in") == self.form_name: # this form filled in
+ if not self.var("filled_in") == self.form_name: # this form filled in
return None
except:
# self.form_name not set, we have no form
- if not self.var("_filled_in"):
+ if not self.var("filled_in"):
return None
- elif not self.var("_filled_in"):
+ elif not self.var("filled_in"):
return None
value = self.req.vars.get(varname, "")
diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js
index 7b641d0..0809ffa 100644
--- a/web/htdocs/js/search.js
+++ b/web/htdocs/js/search.js
@@ -306,7 +306,7 @@ function mkSearchGetUrl(objType, objName, objSite, numMatches) {
else if(numMatches > 1)
return 'view.py?view_name=hosts&host=' + objName;
else
- return 'view.py?view_name=searchsvc&search=Search&_filled_in=on&service=' + objName;
+ return 'view.py?view_name=searchsvc&search=Search&filled_in=on&service=' + objName;
else if(objType == 'hg')
if(numMatches == 1)
return 'view.py?view_name=hostgroup&hostgroup=' + objName + '&site=' + objSite;
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index bb96b82..74e9fa0 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -874,7 +874,7 @@ def load_view_into_html_vars(view):
# Make sure, checkboxes with default "on" do no set "on". Otherwise they
# would always be on
- html.set_var("_filled_in", "create_view")
+ html.set_var("filled_in", "create_view")
# Extract properties of view from HTML variables and construct
# view object, to be used for saving or displaying
@@ -1159,7 +1159,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru
hard_filters = [ multisite_filters[fn] for fn in view["hard_filters"] ]
for varname, value in view["hard_filtervars"]:
# shown filters are set, if form is fresh and variable not supplied in URL
- if not html.var("_filled_in") and not html.has_var(varname):
+ if not html.var("filled_in") and not html.has_var(varname):
html.set_var(varname, value)
# Prepare Filter headers for Livestatus
diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py
index 8f39675..2db8c39 100644
--- a/web/plugins/views/bi.py
+++ b/web/plugins/views/bi.py
@@ -516,7 +516,7 @@ class BIStatusFilter(Filter):
return ""
def display(self):
- if html.var("_filled_in"):
+ if html.var("filled_in"):
defval = ""
else:
defval = "on"
@@ -529,7 +529,7 @@ class BIStatusFilter(Filter):
def filter_table(self, rows):
jeaders = []
- if html.var("_filled_in"):
+ if html.var("filled_in"):
defval = ""
else:
defval = "on"
diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py
index 09284c7..60da59c 100644
--- a/web/plugins/views/filters.py
+++ b/web/plugins/views/filters.py
@@ -188,7 +188,7 @@ class FilterServiceState(Filter):
self.prefix = prefix
def display(self):
- if html.var("_filled_in"):
+ if html.var("filled_in"):
defval = ""
else:
defval = "on"
@@ -199,7 +199,7 @@ class FilterServiceState(Filter):
def filter(self, infoname):
headers = []
- if html.var("_filled_in"):
+ if html.var("filled_in"):
defval = ""
else:
defval = "on"
@@ -229,7 +229,7 @@ class FilterHostState(Filter):
"host", [ "hst0", "hst1", "hst2", "hstp" ], [])
def display(self):
- if html.var("_filled_in"):
+ if html.var("filled_in"):
defval = ""
else:
defval = "on"
@@ -239,7 +239,7 @@ class FilterHostState(Filter):
def filter(self, infoname):
headers = []
- if html.var("_filled_in"):
+ if html.var("filled_in"):
defval = ""
else:
defval = "on"
@@ -465,7 +465,7 @@ class FilterLogClass(Filter):
"log", [ "logclass%d" % l for l, c in self.log_classes ], [])
def display(self):
- if html.var("_filled_in"):
+ if html.var("filled_in"):
defval = ""
else:
defval = "on"
@@ -493,7 +493,7 @@ class FilterLogClass(Filter):
def filter(self, infoname):
headers = []
- if html.var("_filled_in"):
+ if html.var("filled_in"):
defval = ""
else:
defval = "on"
Module: check_mk
Branch: master
Commit: 32faeb5729ca224540ded8c36c09413c2346055c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32faeb5729ca22…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Nov 4 13:22:32 2011 +0100
WATO: fix typo in ram usage rule
---
web/plugins/wato/check_parameters.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index b818d16..5117bf5 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -241,12 +241,12 @@ checkgroups.append((
"the main memory, so <b>at least</b> the half of it is currently swapped out."),
elements = [
Tuple(
- title = _("Specify levels in percentage of RAM"),
+ title = _("Specify levels in percentage of total RAM"),
elements = [
Percentage(title = _("Warning at a usage of"), label = _("% of RAM")),
Percentage(title = _("Critical at a usage of"), label = _("% of RAM"))]),
Tuple(
- title = _("Specify levels in percentage of RAM"),
+ title = _("Specify levels in absolute usage values"),
elements = [
Integer(title = _("Warning at"), unit = _("MB")),
Integer(title = _("Critical at"), unit = _("MB"))]),