From 78b4ae319a8b6733a6a23454d0870e5fdc104a59 Mon Sep 17 00:00:00 2001 From: Mustafa Baser Date: Mon, 15 Apr 2024 11:39:20 +0300 Subject: [PATCH 1/2] fix(jans-cli-tui): jansStatus to status for users Signed-off-by: Mustafa Baser --- .../cli_tui/plugins/070_users/edit_user_dialog.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jans-cli-tui/cli_tui/plugins/070_users/edit_user_dialog.py b/jans-cli-tui/cli_tui/plugins/070_users/edit_user_dialog.py index 82ba88d5e6e..01f9e6222fb 100644 --- a/jans-cli-tui/cli_tui/plugins/070_users/edit_user_dialog.py +++ b/jans-cli-tui/cli_tui/plugins/070_users/edit_user_dialog.py @@ -94,7 +94,7 @@ def get_custom_attribute(attribute, multi=False): return [] if multi else '' if self.data: - active_checked = self.data.get('jansStatus', '').lower() == 'active' + active_checked = self.data.get('status', '').lower() == 'active' else: active_checked = True @@ -153,7 +153,7 @@ def get_custom_attribute(attribute, multi=False): for ca in self.data.get('customAttributes', []): - if ca['name'] in ('middleName', 'sn', 'jansStatus', 'nickname', 'jansActive', 'userPassword'): + if ca['name'] in ('middleName', 'sn', 'status', 'nickname', 'jansActive', 'userPassword'): continue claim_prop = self.get_claim_properties(ca['name']) @@ -237,7 +237,7 @@ def add_claim(self) -> None: for claim in common_data.jans_attributes: if not claim['oxMultiValuedAttribute'] and claim['name'] in cur_claims: continue - if claim['name'] in ('memberOf', 'userPassword', 'uid', 'jansStatus', 'jansActive', 'updatedAt'): + if claim['name'] in ('memberOf', 'userPassword', 'uid', 'status', 'jansActive', 'updatedAt'): continue if claim.get('status') == 'active': claims_list.append((claim['name'], claim['displayName'])) @@ -297,7 +297,7 @@ def save_user(self) -> None: user_info[key_] = self.data[key_] status = raw_data.pop('active') - user_info['jansStatus'] = 'active' if status else 'inactive' + user_info['status'] = 'active' if status else 'inactive' for key_ in raw_data: multi_valued = False From a2b5d7545ea0846d356a191b4a1b7e8a8f5bb79f Mon Sep 17 00:00:00 2001 From: Mohammad Abudayyeh <47318409+moabu@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:01:58 +0300 Subject: [PATCH 2/2] docs: include fix main.html Signed-off-by: Mohammad Abudayyeh <47318409+moabu@users.noreply.github.com> --- docs/overrides/main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/overrides/main.html b/docs/overrides/main.html index ccac1cc6eb2..132bedb074b 100644 --- a/docs/overrides/main.html +++ b/docs/overrides/main.html @@ -16,6 +16,6 @@ {% endblock %}