@@ -300,11 +300,11 @@ def qwc2_config(self, identity, params):
300
300
params .get ("autologin" ) is not None )
301
301
if 'common' in config ['plugins' ]:
302
302
self .__replace_login__helper_plugins (
303
- config ['plugins' ]['common' ], signed_in , hide_login )
303
+ config ['plugins' ]['common' ], signed_in , username , hide_login )
304
304
self .__replace_login__helper_plugins (
305
- config ['plugins' ]['mobile' ], signed_in , hide_login )
305
+ config ['plugins' ]['mobile' ], signed_in , username , hide_login )
306
306
self .__replace_login__helper_plugins (
307
- config ['plugins' ]['desktop' ], signed_in , hide_login )
307
+ config ['plugins' ]['desktop' ], signed_in , username , hide_login )
308
308
309
309
# filter any restricted viewer task items
310
310
viewer_task_permissions = self .viewer_task_permissions (identity )
@@ -507,7 +507,7 @@ def __collect_theme_ids(self, theme_group):
507
507
508
508
return theme_ids
509
509
510
- def __replace_login__helper_plugins (self , plugins , signed_in , hide ):
510
+ def __replace_login__helper_plugins (self , plugins , signed_in , username , hide ):
511
511
"""Search plugins configurations and call
512
512
self.__replace_login__helper_items on menuItems and toolbarItems
513
513
@@ -520,12 +520,12 @@ def __replace_login__helper_plugins(self, plugins, signed_in, hide):
520
520
continue
521
521
if "menuItems" in plugin ["cfg" ]:
522
522
self .__replace_login__helper_items (
523
- plugin ["cfg" ]["menuItems" ], signed_in , hide )
523
+ plugin ["cfg" ]["menuItems" ], signed_in , username , hide )
524
524
if "toolbarItems" in plugin ["cfg" ]:
525
525
self .__replace_login__helper_items (
526
- plugin ["cfg" ]["toolbarItems" ], signed_in , hide )
526
+ plugin ["cfg" ]["toolbarItems" ], signed_in , username , hide )
527
527
528
- def __replace_login__helper_items (self , items , signed_in , hide ):
528
+ def __replace_login__helper_items (self , items , signed_in , username , hide ):
529
529
"""Replace Login with Logout if identity is not None on Login items in
530
530
menuItems and toolbarItems.
531
531
@@ -545,9 +545,10 @@ def __replace_login__helper_items(self, items, signed_in, hide):
545
545
else :
546
546
item ["mode" ] = "Logout"
547
547
item ["icon" ] = "logout"
548
+ item ["trargs" ] = [username ]
548
549
elif "subitems" in item :
549
550
self .__replace_login__helper_items (
550
- item ["subitems" ], signed_in , hide )
551
+ item ["subitems" ], signed_in , username , hide )
551
552
if removeIndex is not None :
552
553
del items [removeIndex ]
553
554
0 commit comments