Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: *_contactgroups lists: Single group rules are all appended. When a list

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b6fb9c2ca0f1ea458ea943fe5d90dbd91e114c3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6fb9c2ca0f1ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 15:03:58 2012 +0100 *_contactgroups lists: Single group rules are all appended. When a list is found as a value this first list is used exclusively. All other matching rules are ignored --- ChangeLog | 3 +++ modules/check_mk.py | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f05e854..8f9f724 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 1.1.13i3: Core, Setup, etc.: + * *_contactgroups lists: Single group rules are all appended. When a list + is found as a value this first list is used exclusively. All other + matching rules are ignored * cmk -d does now honor --cache and --no-tcp * cmk -O/-R now uses omd re{start,load} core if using OMD * FIX: setup.sh now setups up permissions for conf.d/wato diff --git a/modules/check_mk.py b/modules/check_mk.py index b331c5b..b099fc7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1136,14 +1136,12 @@ def host_contactgroups_of(hostlist): cgrs = [] for host in hostlist: # host_contactgroups may take single values as well as - # lists as item value. Of all list entries only the first - # one is used. The single-contact-groups entries are all - # recognized. - first_list = True + # lists as item value. When a list is found only this list + # is used. The single-contact-group entries are skipped in + # this case. for entry in host_extra_conf(host, host_contactgroups): - if type(entry) == list and first_list: - cgrs += entry - first_list = False + if type(entry) == list: + return entry else: cgrs.append(entry) return list(set(cgrs))

12 years, 6 months

Check_MK Git: check_mk: Fixed some WATO naming inconsistences

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf5610727522216e25c1aa8862f8913e722d9aab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf561072752221… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 14:23:08 2012 +0100 Fixed some WATO naming inconsistences --- .bugs/623 | 8 +++++++ web/htdocs/wato.py | 54 +++++++++++++++++++++++++++------------------------ 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/.bugs/623 b/.bugs/623 new file mode 100644 index 0000000..e7b4e39 --- /dev/null +++ b/.bugs/623 @@ -0,0 +1,8 @@ +Title: Plugin Permissions sind doppelt registriert (bei i18n) +Component: wato +State: open +Date: 2012-01-18 13:45:56 +Targetversion: 1.2.0 +Class: bug + +Die Permissions werden bei Umschaltung der Sprache doppelt registriert. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 56d12a8..4cd5732 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3095,7 +3095,7 @@ def render_audit_log(log, what, with_filename = False): htmlcode += "<div class=info>%s</div>" % empty_msg return elif what == 'audit': - htmlcode += "<h3>" + _("Audit log") + "</h3>" + htmlcode += "<h3>" + _("Audit logfile") + "</h3>" elif what == 'pending': if is_distributed(): htmlcode += "<h3>" + _("Changes that are not activated on all sites:") + "</h3>" @@ -3647,7 +3647,7 @@ class ContactGroupsAttribute(Attribute): items.sort(cmp = lambda a,b: cmp(a[1], b[1])) for name, alias in items: html.checkbox(self._name + "_" + name, name in cgs) - html.write(" %s<br>" % (alias and alias or name)) + html.write(' <a href="%s">%s</a><br>' % (make_link([("mode", "edit_contact_group"), ("edit", name)]), alias and alias or name)) html.write("<hr>") html.checkbox(self._name + "_use", use) html.write( " " + _("Add these contact groups to the host's contact groups in the monitoring configuration")) @@ -4069,7 +4069,7 @@ def effective_attributes(host, folder): def mode_snapshot(phase): if phase == "title": - return _("Backup/Restore") + return _("Backup & Restore") elif phase == "buttons": home_button() changelog_button() @@ -4634,7 +4634,7 @@ def mode_groups(phase, what): for userid, user in users.items(): cgs = user.get("contactgroups", []) for cg in cgs: - members.setdefault(cg, []).append(userid) + members.setdefault(cg, []).append((userid, user.get('alias', userid))) odd = "even" for name, alias in sorted: @@ -4648,8 +4648,8 @@ def mode_groups(phase, what): html.write("</td><td>%s</td><td>%s</td>" % (name, alias)) if what == "contact": html.write("<td>%s</td>" % ", ".join( - [ '<a href="%s">%s</a>' % (make_link([("mode", "edit_user"), ("edit", n)]), n) - for n in members.get(name, [])])) + [ '<a href="%s">%s</a>' % (make_link([("mode", "edit_user"), ("edit", userid)]), alias) + for userid, alias in members.get(name, [])])) html.write("</tr>") html.write("</table>") @@ -4804,7 +4804,7 @@ class CheckTypeGroupSelection(ElementSelection): def mode_timeperiods(phase): if phase == "title": - return _("Timeperiod definitions") + return _("Time Periods") elif phase == "buttons": global_buttons() @@ -4839,7 +4839,7 @@ def mode_timeperiods(phase): else: return None - html.write("<h3>" + _("Timeperiod definitions") + "</h3>") + html.write("<h3>" + _("Time Periods") + "</h3>") if len(timeperiods) == 0: html.write("<div class=info>" + _("There are no timeperiods defined yet.") + "</div>") @@ -5160,7 +5160,7 @@ def find_usage_of_timeperiod(tpname): def mode_sites(phase): if phase == "title": - return _("Manage Multisite connections") + return _("Multisite connections") elif phase == "buttons": global_buttons() @@ -6331,15 +6331,17 @@ def delete_distributed_wato_file(): def mode_users(phase): if phase == "title": - return _("Manage Users & Contacts") + return _("Users & Contacts") elif phase == "buttons": global_buttons() html.context_button(_("New user"), make_link([("mode", "edit_user")]), "new") return + roles = load_roles() users = load_users() timeperiods = load_timeperiods() + contact_groups = load_group_information().get("contact", {}) if phase == "action": delid = html.var("_delete") @@ -6365,7 +6367,7 @@ def mode_users(phase): html.write("<h3>" + _("Users & Contacts") + "</h3>") html.write("<table class=data>") html.write("<tr><th>" + _("Actions") + "<th>" - + _("ID") + + _("Name") + "</th><th>" + _("Authentication") + "</th><th>" + _("Locked") + "</th><th>" + _("Full Name") @@ -6417,7 +6419,7 @@ def mode_users(phase): # Roles if user.get("roles", []): html.write("<td>%s</td>" % ", ".join( - [ '<a href="%s">%s</a>' % (make_link([("mode", "edit_role"), ("edit", r)]), r) for r in user["roles"]])) + [ '<a href="%s">%s</a>' % (make_link([("mode", "edit_role"), ("edit", r)]), roles[r].get('alias')) for r in user["roles"]])) else: html.write("<td></td>") @@ -6426,7 +6428,7 @@ def mode_users(phase): cgs = user.get("contactgroups", []) if cgs: html.write(", ".join( - [ '<a href="%s">%s</a>' % (make_link([("mode", "edit_contact_group"), ("edit", c)]), c) for c in cgs])) + [ '<a href="%s">%s</a>' % (make_link([("mode", "edit_contact_group"), ("edit", c)]), contact_groups[c]) for c in cgs])) else: html.write("<i>" + _("none") + "</i>") html.write("</td>") @@ -6447,6 +6449,8 @@ def mode_users(phase): elif tp != "24X7": url = make_link([("mode", "edit_timeperiod"), ("edit", tp)]) tp = '<a href="%s">%s</a>' % (url, timeperiods[tp].get("alias", tp)) + else: + tp = _("Always") html.write(tp) html.write("</td>") html.write("</tr>") @@ -6497,9 +6501,9 @@ def mode_edit_user(phase): id = html.var("userid").strip() if new and id in users: - raise MKUserError("userid", _("This id is already being used by another user.")) + raise MKUserError("userid", _("This username is already being used by another user.")) if not re.match("^[-a-z0-9A-Z_]+$", id): - raise MKUserError("userid", _("The user id must consist only of letters, digit and the underscore.")) + raise MKUserError("userid", _("The username must consist only of letters, digit and the underscore.")) if new: new_user = {} @@ -6597,7 +6601,7 @@ def mode_edit_user(phase): # ID html.write("<tr><td class=legend>") - html.write(_("User ID")) + html.write(_("Username")) html.write("</td><td class=content>") if new: html.text_input("userid", userid) @@ -6683,7 +6687,7 @@ def mode_edit_user(phase): for role_id, role in entries: html.checkbox("role_" + role_id, role_id in user.get("roles", [])) url = make_link([("mode", "edit_role"), ("edit", role_id)]) - html.write("%s - <a href='%s'>%s</a><br>" % (role_id, url, role["alias"])) + html.write("<a href='%s'>%s</a><br>" % (url, role["alias"])) html.write("</td></tr>") # Contact groups @@ -6710,7 +6714,7 @@ def mode_edit_user(phase): alias = gid html.checkbox("cg_" + gid, gid in user.get("contactgroups", [])) url = make_link([("mode", "edit_contact_group"), ("edit", gid)]) - html.write(" %s - <a href=\"%s\">%s</a><br>" % (gid, url, alias)) + html.write(" <a href=\"%s\">%s</a><br>" % (url, alias)) html.write("</td></tr>") @@ -6728,8 +6732,8 @@ def mode_edit_user(phase): html.write(_("Notification time period<br><i>Only during this time period the " "user will get notifications about host or service alerts.")) html.write("</td><td class=content>") - choices = [ ( "24X7", _("24X7 - Always")) ] + \ - [ ( id, "%s - %s" % (id, tp["alias"])) for (id, tp) in timeperiods.items() ] + choices = [ ( "24X7", _("Always")) ] + \ + [ ( id, "%s" % (tp["alias"])) for (id, tp) in timeperiods.items() ] html.sorted_select("notification_period", choices, user.get("notification_period")) html.write("</td></tr>") @@ -6988,7 +6992,7 @@ class UserSelection(ElementSelection): def mode_roles(phase): if phase == "title": - return _("Manage Roles & Permissions") + return _("Roles & Permissions") elif phase == "buttons": global_buttons() @@ -7035,11 +7039,11 @@ def mode_roles(phase): return None - html.write("<h3>" + _("User Roles") + "</h3>") + html.write("<h3>" + _("Roles") + "</h3>") html.write("<table class=data>") html.write("<tr>" + "<th>" + _("Actions") + "</th>" - + "<th>" + _("ID") + "</th>" + + "<th>" + _("Name") + "</th>" + "<th>" + _("Alias") + "</th>" + "<th>" + _("Type") + "</th>" + "<th>" + _("Modifications") + "</th>" @@ -7302,7 +7306,7 @@ def rename_user_role(id, new_id): def mode_hosttags(phase): if phase == "title": - return _("Manage host tag groups") + return _("Host tag groups") elif phase == "buttons": global_buttons() @@ -9075,7 +9079,7 @@ def page_user_profile(): html.write("<table class=form>") html.write("<tr><td class=legend colspan=2>") - html.write(_("Username")) + html.write(_("Name")) html.write("</td><td class=content>") html.write(config.user_id) html.write("</td></tr>")

12 years, 6 months

Check_MK Git: check_mk: FIX: Fixed problem with duplicate extra_buttons when using the i18n of multiisite

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 02ae3a5261c2c5e0029cad02bd8bd5825fd49af2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02ae3a5261c2c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 13:31:17 2012 +0100 FIX: Fixed problem with duplicate extra_buttons when using the i18n of multiisite --- ChangeLog | 1 + web/htdocs/wato.py | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bba9e47..f05e854 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * Using Username as default value for full names when editing users * FIX: Fixed missing folders in "move to" dropdown fields * FIX: Fixed "move to target folders" after CSV import + * FIX: Fixed problem with duplicate extra_buttons when using the i18n of multiisite BI: * improve doc/treasures/check_bi_local.py: local check that creates diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 181857e..56d12a8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9606,16 +9606,18 @@ modes = { "edit_hosttag" : (["hosttags"], mode_edit_hosttag), } -extra_buttons = [ -] - loaded_with_language = False def load_plugins(): + global extra_buttons global loaded_with_language if loaded_with_language == current_language: return loaded_with_language = current_language + # Reset global vars + global extra_buttons + extra_buttons = [] + # Declare WATO-specific permissions config.declare_permission_section("wato", _("WATO - Check_MK's Web Administration Tool"))

12 years, 6 months

Check_MK Git: check_mk: Merge branch 'master' 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: 680912d5d6c8b74988824412f42021c52546c7ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=680912d5d6c8b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 13:31:22 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: Better error message for regex errors

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eb5961175c2b0d99126a4a2d5017b313ccef645d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb5961175c2b0d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 18 13:05:02 2012 +0100 Better error message for regex errors --- web/htdocs/forms.py | 4 ++-- web/htdocs/valuespec.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 8775414..9df5239 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -29,7 +29,7 @@ from lib import * def edit_dictionary(entries, value, focus=None, hover_help=True): new_value = value.copy() - if html.check_transaction(): + if html.var("filled_in") == "form" and html.check_transaction(): messages = [] for name, vs in entries: try: @@ -37,7 +37,7 @@ def edit_dictionary(entries, value, focus=None, hover_help=True): vs.validate_value(v, name) new_value[name] = v except MKUserError, e: - messages.append(vs.title() + ": " + e.message) + messages.append(u"%s: %s" % (vs.title(), e.message)) html.add_user_error(e.varname, e.message) if messages: html.show_error("".join(["%s<br>\n" % m for m in messages])) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4edad63..fe7907f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -265,6 +265,8 @@ class TextAscii(ValueSpec): self._size = kwargs.get("size", 30) self._allow_empty = kwargs.get("allow_empty", True) self._regex = kwargs.get("regex") + self._regex_error = kwargs.get("regex_error", + _("Your input odes not match the required format.")) if type(self._regex) == str: self._regex = re.compile(self._regex) @@ -289,7 +291,7 @@ class TextAscii(ValueSpec): raise MKUserError(varprefix, _("An empty value is not allowed here.")) if value and self._regex: if not self._regex.match(value): - raise MKUserError(varprefix, _("Your input odes not match the required format.")) + raise MKUserError(varprefix, self._regex_error) class EmailAddress(TextAscii):

12 years, 6 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c4c26038bc449ab225ddfbb7a6829acb38ebfde1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4c26038bc449a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 18 13:05:05 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: Fixed problems when changing the language using the profile edit dialog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d5c400d6914f47ae6f986ab7374b64b254648a53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5c400d6914f47… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 11:56:30 2012 +0100 Fixed problems when changing the language using the profile edit dialog --- web/htdocs/index.py | 17 ----------------- web/htdocs/lib.py | 24 +++++++++++++++++++++++- web/htdocs/wato.py | 22 ++++++++++++++++------ 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index ab3c301..d6b0fd3 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -156,23 +156,6 @@ def connect_to_livestatus(html): # Default auth domain is read. Please set to None to switch off authorization html.live.set_auth_domain('read') -def load_language(lang): - # Make current language globally known to all of our modules - __builtin__.current_language = lang - - if lang: - locale_base = defaults.locale_dir - po_path = '/%s/LC_MESSAGES/multisite.po' % lang - # Use file in OMD local strucuture when existing - if os.path.exists(local_locale_path + po_path): - locale_base = local_locale_path - try: - i18n = gettext.translation('multisite', locale_base, languages = [ lang ], codeset = 'UTF-8') - i18n.install(unicode = True) - except IOError, e: - # Fallback to hardcoded default if the given language does not exist - __builtin__.current_language = config.default_language - # Main entry point for all HTTP-requests (called directly by mod_apache) def handler(req, profiling = True): diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 5662752..cd5f0e9 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import grp, defaults, pprint, os, gettext +import grp, defaults, pprint, os, gettext, __builtin__ nagios_state_names = { -1: "NODATA", 0: "OK", 1: "WARNING", 2: "CRITICAL", 3: "UNKNOWN", 4: "DEPENDENT" } nagios_short_state_names = { -1: "PEND", 0: "OK", 1: "WARN", 2: "CRIT", 3: "UNKN", 4: "DEP" } @@ -147,6 +147,28 @@ def get_languages(): return languages +def load_language(lang): + # Make current language globally known to all of our modules + __builtin__.current_language = lang + + if lang: + locale_base = defaults.locale_dir + local_locale_path = defaults.omd_root + "/local/share/check_mk/locale" + po_path = '/%s/LC_MESSAGES/multisite.po' % lang + # Use file in OMD local strucuture when existing + if os.path.exists(local_locale_path + po_path): + locale_base = local_locale_path + + try: + i18n = gettext.translation('multisite', locale_base, languages = [ lang ], codeset = 'UTF-8') + i18n.install(unicode = True) + except IOError, e: + # Fallback to hardcoded default if the given language does not exist + __builtin__.current_language = config.default_language + else: + # Replace the _() function to disable i18n again + __builtin__._ = lambda x: x + def pnp_cleanup(s): return s \ .replace(' ', '_') \ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 27559f5..181857e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9007,14 +9007,13 @@ def register_rule(group, varname, valuespec = None, title = None, # def page_user_profile(): - html.header(_("Edit user profile"), javascripts = ['wato'], stylesheets = ['check_mk', 'pages', 'wato', 'status']) - if not config.user_id: raise MKUserError(None, _('Not logged in.')) if not config.may('edit_profile') and not config.may('change_password'): raise MKAuthException(_("You are not allowed to edit your user profile.")) + success = None if html.has_var('_save') and html.check_transaction(): try: users = load_users() @@ -9033,8 +9032,13 @@ def page_user_profile(): else: # Remove the customized language - del users[config.user_id]['language'] - del config.user['language'] + if 'language' in users[config.user_id]: + del users[config.user_id]['language'] + if 'language' in config.user: + del config.user['language'] + + # load the new language + load_language(config.get_language()) # # Change the password if requested @@ -9049,14 +9053,20 @@ def page_user_profile(): users[config.user_id]['password'] = encrypt_password(password) save_users(users) - - html.message(_("Successfully updated user profile.")) + success = True if password: html.write("<script type='text/javascript'>if(top) top.location.reload(); else document.location.reload();</script>") + else: + html.reload_sidebar() except MKUserError, e: html.add_user_error(e.varname, e.message) + html.header(_("Edit user profile"), javascripts = ['wato'], stylesheets = ['check_mk', 'pages', 'wato', 'status']) + + if success: + html.message(_("Successfully updated user profile.")) + if html.has_user_errors(): html.show_user_errors()

12 years, 6 months

Check_MK Git: check_mk: FIX: Creating auth. php file on first login dialog based login to ensure

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a5a3bb6086e6a7844e2c379fdba8a60bfdf27ff9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5a3bb6086e6a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 11:32:10 2012 +0100 FIX: Creating auth.php file on first login dialog based login to ensure it exists after login when it is first needed --- ChangeLog | 2 ++ web/htdocs/login.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c6dcd8..bba9e47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,8 @@ * FIX: Fixed auth problem when following logwatch icon links while using the form based auth * FIX: Fix problem with Umlaut in contact alias + * FIX: Creating auth.php file on first login dialog based login to ensure + it exists after login when it is first needed Mobile: * Improved sorting of views in main page diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 7d92280..0f74f53 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -202,6 +202,16 @@ def page_login(): return normal_login_page() def normal_login_page(): + # Working around the problem that the auth.php file needed for multisite based + # authorization of external addons might not exist when setting up a new installation + # We assume: Each user must visit this login page before using the multisite based + # authorization. So we can easily create the file here if it is missing. + # This is a good place to replace old api based files in the future. + if not os.path.exists(defaults.var_dir + '/wato/auth/auth.php'): + import wato + wato.load_plugins() + wato.create_auth_file(wato.load_users()) + html.set_render_headfoot(False) html.header(_("Check_MK Multisite Login"), javascripts=[], stylesheets=["pages", "login"])

12 years, 6 months

Check_MK Git: check_mk: Using Username as default value for full names when editing users

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 442181fbda7ff8e1e266722b23e6c6879a23a3af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=442181fbda7ff8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 11:18:26 2012 +0100 Using Username as default value for full names when editing users --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d1f3db..8c6dcd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ WATO: * Removed IP-Address attribute from folders * Supporting localized tag titles + * Using Username as default value for full names when editing users * FIX: Fixed missing folders in "move to" dropdown fields * FIX: Fixed "move to target folders" after CSV import diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 029a47d..27559f5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6611,7 +6611,7 @@ def mode_edit_user(phase): html.write("<tr><td class=legend>") html.write(_("Full name") + "<br><i>" + _("Full name or alias of the user</i>")) html.write("</td><td class=content>") - html.text_input("alias", user.get("alias", ""), size = 50) + html.text_input("alias", user.get("alias", userid), size = 50) if not new: html.set_focus("alias") html.write("</td></tr>")

12 years, 6 months

Check_MK Git: check_mk: Updated bug entries #0618, #0619, #0620, #0621, #0622

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a28b3ba641f7eb5f2ec7809789e0e72733afa2de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a28b3ba641f7eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 10:44:08 2012 +0100 Updated bug entries #0618, #0619, #0620, #0621, #0622 --- .bugs/618 | 15 +++++++++++++++ .bugs/619 | 8 ++++++++ .bugs/620 | 8 ++++++++ .bugs/621 | 8 ++++++++ .bugs/622 | 9 +++++++++ 5 files changed, 48 insertions(+), 0 deletions(-) diff --git a/.bugs/618 b/.bugs/618 new file mode 100644 index 0000000..8bf2335 --- /dev/null +++ b/.bugs/618 @@ -0,0 +1,15 @@ +Title: Hosts Snapin berücksichtigt Nutzer Berechtigungen nicht +Component: multisite +State: open +Date: 2012-01-18 10:25:53 +Targetversion: 1.2.0 +Class: bug + +Ich habe gerade eine leere Site mit 2 Hosts in 2 Foldern angelegt. Auf den einen ist +der Nutzer berechtigt, auf den anderen nicht. Im Hosts Snapin sehe ich troztem beide +Folder und auch die Summen der Hosts zählen 2, obwohl ich nur 1 sehen darf. + +Lösungsmöglichkeit: + +Das Snapin nur noch für die Statusgui Navigation benutzen und dann via Livestatus +Query die Anzahl der Hosts herausfinden. diff --git a/.bugs/619 b/.bugs/619 new file mode 100644 index 0000000..5cfca54 --- /dev/null +++ b/.bugs/619 @@ -0,0 +1,8 @@ +Title: Bulk löschen berücksichtigt die Nutzer Rechte nicht +Component: wato +State: open +Date: 2012-01-18 10:28:38 +Targetversion: 1.2.0 +Class: bug + +Ich kann als Nutzer ohne Rechte auf die Hosts in einem Folder alle Hosts löschen. diff --git a/.bugs/620 b/.bugs/620 new file mode 100644 index 0000000..4635053 --- /dev/null +++ b/.bugs/620 @@ -0,0 +1,8 @@ +Title: Bulk edit berücksichtigt die Nutzer Rechte nicht +Component: wato +State: open +Date: 2012-01-18 10:30:06 +Targetversion: 1.2.0 +Class: bug + +Ich kann Hosts auf die ich keine Rechte habe über die Bulk Edit Funktion bearbeiten. diff --git a/.bugs/621 b/.bugs/621 new file mode 100644 index 0000000..6ebd595 --- /dev/null +++ b/.bugs/621 @@ -0,0 +1,8 @@ +Title: Bulk moveto berücksichtigt die Nutzer Rechte nicht +Component: wato +State: open +Date: 2012-01-18 10:30:57 +Targetversion: 1.2.0 +Class: bug + +Ich kann Hosts aus anderen Foldern in meine Folder verschieben diff --git a/.bugs/622 b/.bugs/622 new file mode 100644 index 0000000..b0dbafe --- /dev/null +++ b/.bugs/622 @@ -0,0 +1,9 @@ +Title: Inventory prüft die Rechte nicht ordentlich +Component: wato +State: open +Date: 2012-01-18 10:31:24 +Targetversion: 1.2.0 +Class: bug + +Ich kann sowohl via Bulk Inventory, als auch über das normale Inventory das Inventory eines +Hosts anstoßen, auch wenn ich keine Rechte habe.

12 years, 6 months

← Newer
1
...
16
17
18
19
20
21
22
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012