Skip to content

Commit bcefe06

Browse files
committed
hotfix: fix displaying of agent download slideout in community edition
Change-Id: Iadb4213811d6e3bb55a459a05804674f861d4046
1 parent 5096c82 commit bcefe06

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

cmk/gui/wato/pages/hosts.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
PageMenuTopic,
4444
)
4545
from cmk.gui.pages import AjaxPage, PageContext, PageEndpoint, PageRegistry, PageResult
46+
from cmk.gui.permissions import permission_registry
4647
from cmk.gui.quick_setup.html import quick_setup_duplication_warning, quick_setup_locked_warning
4748
from cmk.gui.site_config import is_distributed_setup_remote_site, site_is_local
4849
from cmk.gui.type_defs import ActionResult, IconNames, PermissionName, StaticIcon
@@ -384,7 +385,9 @@ def page(self, config: Config) -> None:
384385
form_name: Final[str] = "edit_host"
385386
version = ".".join(omd_version(omd_root).split(".")[:-1])
386387
hostname = self._host.name()
387-
can_download_baked_agents = user.may("wato.agents") and user.may("wato.download_agents")
388+
can_download_baked_agents = "wato.agents" not in permission_registry or (
389+
user.may("wato.agents") and user.may("wato.download_agents")
390+
)
388391
html.vue_component(
389392
component_name="cmk-mode-host",
390393
data=asdict(

cmk/gui/wato/pages/services.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
)
5555
from cmk.gui.page_menu_entry import disable_page_menu_entry, enable_page_menu_entry
5656
from cmk.gui.pages import AjaxPage, PageContext, PageEndpoint, PageRegistry, PageResult
57+
from cmk.gui.permissions import permission_registry
5758
from cmk.gui.table import Foldable, Table, table_element
5859
from cmk.gui.type_defs import HTTPVariables, IconNames, PermissionName, StaticIcon
5960
from cmk.gui.utils.agent_commands import get_agent_slideout, get_server_per_site
@@ -819,8 +820,8 @@ def _render_agent_download_tooltip(self, output: str) -> None:
819820
agent_install_cls=AgentInstallCmds,
820821
agent_registration_cls=AgentRegistrationCmds,
821822
version=version,
822-
can_download_baked_agents=user.may("wato.agents")
823-
and user.may("wato.download_agents"),
823+
can_download_baked_agents="wato.agents" not in permission_registry
824+
or (user.may("wato.agents") and user.may("wato.download_agents")),
824825
),
825826
)
826827
),

0 commit comments

Comments
 (0)