Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support other_apps_custom in NGUI configuration since v18.6.0 (perun v47.0.0) #142

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ perun_ngui_admin_password_help: '{{ perun_ngui_password_help }}'
perun_ngui_admin_other_apps:
en:
profile: "Profile"
perun_ngui_admin_other_apps_custom:

#new GUI Profile
perun_ngui_profile_enabled: no
Expand Down Expand Up @@ -368,6 +369,7 @@ perun_ngui_profile_other_apps:
admin: "IAM Administration"
cs:
admin: "Správa IAM"
perun_ngui_profile_other_apps_custom:
perun_ngui_profile_link_to_admin_gui_by_roles: [
"PERUNADMIN",
"PERUNOBSERVER",
Expand Down Expand Up @@ -405,6 +407,7 @@ perun_ngui_consolidator_document_title: "Consolidator"
perun_ngui_consolidator_other_apps:
en:
profile: "Profile"
perun_ngui_consolidator_other_apps_custom:
perun_ngui_consolidator_client_id: "xxx-xxxx-xxxx-xxx-xx-xxx"
perun_ngui_consolidator_oauth_authority: '{{ perun_ngui_oauth_authority }}'
perun_ngui_consolidator_oauth_csp_url: '{{ perun_ngui_consolidator_oauth_authority }}'
Expand Down Expand Up @@ -508,6 +511,7 @@ perun_ngui_publications_other_apps:
en:
admin: "IAM Administration"
profile: "Profile"
perun_ngui_publications_other_apps_custom:
perun_ngui_publications_link_to_admin_gui_by_roles: [
"PERUNADMIN",
"PERUNOBSERVER",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"proxy_logout": {{ perun_ngui_consolidator_proxy_logout|bool|to_json }},
"document_title": "{{ perun_ngui_consolidator_document_title }}",
"other_apps": {{ perun_ngui_consolidator_other_apps|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"other_apps_custom": {{ perun_ngui_consolidator_other_apps_custom|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"link_to_admin_gui_by_roles": {{ perun_ngui_publications_link_to_admin_gui_by_roles|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"instance_favicon": {{ perun_ngui_consolidator_instance_favicon|to_json }},
"path_to_idp_provider_userinfo": {{ perun_ngui_consolidator_path_to_idp_provider_userinfo|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
Expand Down
1 change: 1 addition & 0 deletions templates/instance_configs/instanceConfig.json.j2
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"footer": {{ perun_ngui_footer|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"log_out_enabled": {{ perun_ngui_admin_log_out_enabled|bool|to_json }},
"other_apps": {{ perun_ngui_admin_other_apps|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"other_apps_custom": {{ perun_ngui_admin_other_apps_custom|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"logo": {{ perun_ngui_logo|to_json }},
"theme": {{ perun_ngui_theme|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"brandings": {{ perun_ngui_admin_brandings|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
Expand Down
1 change: 1 addition & 0 deletions templates/instance_configs/profileInstanceConfig.json.j2
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"warning_message": "{{ perun_ngui_profile_warning_message }}",
{% endif %}
"other_apps": {{ perun_ngui_profile_other_apps|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"other_apps_custom": {{ perun_ngui_profile_other_apps_custom|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"logo": {{ perun_ngui_profile_logo|to_json }},
"brandings": {{ perun_ngui_profile_brandings|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"use_new_consolidator": {{ perun_ngui_profile_use_new_consolidator|to_json }},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"header_label_cs": "{{ perun_ngui_publications_header_label_cs }}",
"export_limit": {{ perun_ngui_table_export_limit }},
"other_apps": {{ perun_ngui_publications_other_apps|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"other_apps_custom": {{ perun_ngui_publications_other_apps_custom|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"footer": {{ perun_ngui_publications_footer|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"theme": {{ perun_ngui_publications_theme|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }},
"brandings": {{ perun_ngui_publications_brandings|to_nice_json(indent=2,ensure_ascii=False)|indent(2) }}
Expand Down