Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

Fix loosing non-general properties when editing a page type

by Mathias Kettner

Module: check_mk Branch: master Commit: 6f1d84ddc4e68b7962380645f36741c1c4450ae2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f1d84ddc4e68b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 1 10:47:35 2016 +0100 Fix loosing non-general properties when editing a page type --- web/htdocs/pagetypes.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 37e2d51..a951588 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -898,16 +898,16 @@ class Overridable: new_page_dict = forms.edit_valuespec(vs, page_dict, validate=validate) if new_page_dict != None: + # Take over keys from previous value that are specific to the page type + # and not edited here. + if mode in ("edit", "clone"): + for key, value in page_dict.items(): + new_page_dict.setdefault(key, value) + owner = html.var("owner", config.user_id) new_page_dict["owner"] = owner new_page = self(new_page_dict) - if mode in ("edit", "clone"): - # Take over non-editable keys from previous version - for key in page_dict: - if key not in new_page_dict: - new_page_dict[key] = page_dict[key] - self.add_page(new_page) self.save_user_instances(owner) html.immediate_browser_redirect(1, back_url)

8 years, 8 months

openhardwaremonitor.temperature: updated to new temperature api

by Sebastian Herbord

Module: check_mk Branch: master Commit: a4a9bbc93fb2a0c00cef6b520278a929e04d3889 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4a9bbc93fb2a0… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 1 10:36:39 2016 +0100 openhardwaremonitor.temperature: updated to new temperature api --- checks/openhardwaremonitor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/openhardwaremonitor b/checks/openhardwaremonitor index d64d411..af29bb3 100644 --- a/checks/openhardwaremonitor +++ b/checks/openhardwaremonitor @@ -159,7 +159,7 @@ def check_openhardwaremonitor_temperature(item, params, parsed): if item in parsed.get('Temperature', {}): traits = type_trait('Temperature') val = parsed['Temperature'][item] * traits['factor'] - return check_temperature(val, params) + return check_temperature(val, params, "openhardwaremonitor_%s" % item) check_info['openhardwaremonitor.temperature'] = {

8 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016