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

[AIRFLOW-6734] Use configured base_template instead of hard-coding #7367

Merged
merged 1 commit into from
Feb 6, 2020

Conversation

ashb
Copy link
Member

@ashb ashb commented Feb 5, 2020

Flask/FAB gives us a base_template variable that we should use instead
of hard-coding a specific template to extend.

At the time this PR was submitted, airflow/master.html is empty apart from a call to extend the customized appbuilder/baselayout.html, which is the current value of base_template. That is tidied up in AIRFLOW-6733/#7366, but this change has been done separately as they can be merged in either order without any ill-effect.


Issue link: AIRFLOW-6734

Make sure to mark the boxes below before creating PR: [x]

  • Description above provides context of the change
  • Commit message/PR title starts with [AIRFLOW-NNNN]. AIRFLOW-NNNN = JIRA ID*
  • Unit tests coverage for changes (not needed for documentation changes)
  • Commits follow "How to write a good git commit message"
  • Relevant documentation is updated including usage instructions.
  • I will engage committers as explained in Contribution Workflow Example.

* For document-only changes commit message can start with [AIRFLOW-XXXX].


In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.
Read the Pull Request Guidelines for more information.

Flask/FAB gives us a `base_template` variable that we should use instead
of hard-coding a specific template to extend.
@boring-cyborg boring-cyborg bot added the area:webserver Webserver related Issues label Feb 5, 2020
@ashb ashb requested a review from mik-laj February 5, 2020 13:22
@codecov-io
Copy link

Codecov Report

Merging #7367 into master will increase coverage by 53.33%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #7367       +/-   ##
===========================================
+ Coverage   32.84%   86.17%   +53.33%     
===========================================
  Files         871      871               
  Lines       40627    40627               
===========================================
+ Hits        13343    35011    +21668     
+ Misses      27284     5616    -21668
Impacted Files Coverage Δ
airflow/bin/airflow 84.61% <0%> (ø) ⬆️
airflow/plugins_manager.py 86.95% <0%> (+0.72%) ⬆️
airflow/bin/cli.py 94.73% <0%> (+2.1%) ⬆️
airflow/executors/celery_executor.py 88.51% <0%> (+3.37%) ⬆️
airflow/exceptions.py 100% <0%> (+3.57%) ⬆️
airflow/utils/decorators.py 90.47% <0%> (+4.76%) ⬆️
airflow/kubernetes/pod_launcher.py 92.25% <0%> (+5.63%) ⬆️
airflow/www/forms.py 100% <0%> (+8%) ⬆️
airflow/utils/timeout.py 75% <0%> (+8.33%) ⬆️
airflow/kubernetes/kube_client.py 85.71% <0%> (+8.57%) ⬆️
... and 731 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ea93bb6...938988d. Read the comment docs.

@ashb ashb requested review from dimberman and potiuk February 5, 2020 17:03
@ashb ashb merged commit 976ec4d into apache:master Feb 6, 2020
ashb added a commit to astronomer/airflow that referenced this pull request Feb 6, 2020
…pache#7367)

Flask/FAB gives us a `base_template` variable that we should use instead
of hard-coding a specific template to extend.

(cherry picked from commit 976ec4d)
galuszkak pushed a commit to FlyrInc/apache-airflow that referenced this pull request Mar 5, 2020
…pache#7367)

Flask/FAB gives us a `base_template` variable that we should use instead
of hard-coding a specific template to extend.
kaxil added a commit that referenced this pull request Mar 23, 2020
kaxil added a commit that referenced this pull request Mar 30, 2020
kaxil added a commit to astronomer/airflow that referenced this pull request Mar 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:webserver Webserver related Issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants