[checkmk-commits] Fixed merge issues in recent fix

Module: check_mk Branch: master Commit: 21f2d89b21b6a46db1d639641d6d33dcfef5eae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21f2d89b21b6a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 3 11:14:26 2017 +0100 Fixed merge issues in recent fix Change-Id: Ia895d31fe72711bf7e794afaef1e7ad1e118f9e0 --- web/plugins/sidebar/shipped.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 7903393..52b21b4 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1495,7 +1495,7 @@ class BookmarkList(pagetypes.Overridable): title = _("URL"), size = 50, allow_empty = False, - validate = self.validate_url, + validate = cls.validate_url, )), (IconSelector( title = _("Icon"), @@ -1528,6 +1528,7 @@ class BookmarkList(pagetypes.Overridable): return parameters + @classmethod def validate_url(cls, value, varprefix): parsed = urlparse.urlparse(value) @@ -1539,7 +1540,6 @@ class BookmarkList(pagetypes.Overridable): @classmethod def _load(cls): cls.load_legacy_bookmarks() - self.load_legacy_bookmarks() @classmethod