Skip to content

Fix doc link permission name #14972

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.

Sign up for GitHub

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

Merged
kaxil merged 4 commits into from
Mar 31, 2021
Merged

Fix doc link permission name #14972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1266ad
blah.
jhtimmins Feb 18, 2021
4b94614
Update the doc link permission names.
jhtimmins Mar 20, 2021
b309521
Remove blah.py.
jhtimmins Mar 24, 2021
50cc4d2
docs_link => Documentation.
jhtimmins Mar 24, 2021
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
2 changes: 1 addition & 1 deletion airflow/security/permissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
RESOURCE_DAG = "DAGs"
RESOURCE_DAG_PREFIX = "DAG:"
RESOURCE_DOCS_MENU = "Docs"
RESOURCE_DOCS_LINKS = "docs_links"
RESOURCE_DOCS = "Documentation"
RESOURCE_CONFIG = "Configurations"
RESOURCE_CONNECTION = "Connections"
RESOURCE_DAG_CODE = "DAG Code"
Expand Down
10 changes: 5 additions & 5 deletions airflow/www/extensions/init_appbuilder_links.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@
def init_appbuilder_links(app):
"""Add links to Docs menu in navbar"""
appbuilder = app.appbuilder
appbuilder.add_link(name="docs_links", label="Documentation", href=get_docs_url(), category="Docs")
appbuilder.add_link(name="Documentation", label="Documentation", href=get_docs_url(), category="Docs")
appbuilder.add_link(
name="docs_links", label="Airflow Website", href='https://airflow.apache.org', category="Docs"
name="Documentation", label="Airflow Website", href='https://airflow.apache.org', category="Docs"
)
appbuilder.add_link(
name="docs_links", label="GitHub Repo", href='https://github.com/apache/airflow', category="Docs"
name="Documentation", label="GitHub Repo", href='https://github.com/apache/airflow', category="Docs"
)
appbuilder.add_link(
name="docs_links",
name="Documentation",
label="REST API Reference (Swagger UI)",
href='/api/v1./api/v1_swagger_ui_index',
category="Docs",
)
appbuilder.add_link(
name="docs_links", label="REST API Reference (Redoc)", href="RedocView.redoc", category='Docs'
name="Documentation", label="REST API Reference (Redoc)", href="RedocView.redoc", category='Docs'
)
2 changes: 1 addition & 1 deletion airflow/www/security.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class AirflowSecurityManager(SecurityManager, LoggingMixin): # pylint: disable=
(permissions.ACTION_CAN_ACCESS_MENU, permissions.RESOURCE_SLA_MISS),
(permissions.ACTION_CAN_ACCESS_MENU, permissions.RESOURCE_TASK_INSTANCE),
(permissions.ACTION_CAN_ACCESS_MENU, permissions.RESOURCE_DOCS_MENU),
(permissions.ACTION_CAN_ACCESS_MENU, permissions.RESOURCE_DOCS_LINKS),
(permissions.ACTION_CAN_ACCESS_MENU, permissions.RESOURCE_DOCS),
(permissions.ACTION_CAN_THIS_FORM_GET, permissions.RESOURCE_RESET_MY_PASSWORD_VIEW),
(permissions.ACTION_CAN_THIS_FORM_POST, permissions.RESOURCE_RESET_MY_PASSWORD_VIEW),
(permissions.ACTION_RESETMYPASSWORD, permissions.RESOURCE_USER_DB_MODELVIEW),
Expand Down
2 changes: 1 addition & 1 deletion tests/www/test_security.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ def test_get_user_roles_for_anonymous_user(self):
(permissions.ACTION_CAN_ACCESS_MENU, permissions.RESOURCE_SLA_MISS),
(permissions.ACTION_CAN_ACCESS_MENU, permissions.RESOURCE_TASK_INSTANCE),
(permissions.ACTION_CAN_ACCESS_MENU, permissions.RESOURCE_DOCS_MENU),
(permissions.ACTION_CAN_ACCESS_MENU, permissions.RESOURCE_DOCS_LINKS),
(permissions.ACTION_CAN_ACCESS_MENU, permissions.RESOURCE_DOCS),
(permissions.ACTION_CAN_THIS_FORM_GET, permissions.RESOURCE_RESET_MY_PASSWORD_VIEW),
(permissions.ACTION_CAN_THIS_FORM_POST, permissions.RESOURCE_RESET_MY_PASSWORD_VIEW),
(permissions.ACTION_RESETMYPASSWORD, permissions.RESOURCE_USER_DB_MODELVIEW),
Expand Down