Skip to content

Commit baedb5d

Browse files
committed
Also filter plugins without cfg block
1 parent 4691c2e commit baedb5d

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/qwc2_viewer.py

+3-7
Original file line numberDiff line numberDiff line change
@@ -562,21 +562,17 @@ def __filter_restricted_viewer_tasks(self, plugins,
562562
if not viewer_task_permissions[key]:
563563
plugins_to_remove = []
564564
for plugin in plugins:
565-
if 'cfg' not in plugin:
566-
# skip plugin without cfg
567-
continue
568-
569565
if plugin.get("name") == key:
570566
plugins_to_remove.append(plugin)
571567
elif plugin.get("name") == "TaskButton" and \
572-
plugin["cfg"]["task"] + plugin["cfg"].get('mode', '') == key:
568+
plugin.get("cfg", {}).get("task", "") + plugin.get("cfg").get('mode', "") == key:
573569
plugins_to_remove.append(plugin)
574570

575-
if 'menuItems' in plugin['cfg']:
571+
if 'menuItems' in plugin.get('cfg', {}):
576572
self.__filter_config_items(
577573
plugin['cfg']['menuItems'], key
578574
)
579-
if 'toolbarItems' in plugin['cfg']:
575+
if 'toolbarItems' in plugin.get('cfg', {}):
580576
self.__filter_config_items(
581577
plugin['cfg']['toolbarItems'], key
582578
)

0 commit comments

Comments
 (0)