-
Notifications
You must be signed in to change notification settings - Fork 14.2k
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-6733] Extend not replace template #7366
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit just moves the existing template to airflow/master.html (without further changes)
This makes is easier to see which parts of the template we have changed.
6 tasks
Codecov Report
@@ Coverage Diff @@
## master #7366 +/- ##
==========================================
+ Coverage 32.84% 85.44% +52.6%
==========================================
Files 871 871
Lines 40627 40627
==========================================
+ Hits 13343 34714 +21371
+ Misses 27284 5913 -21371
Continue to review full report at Codecov.
|
Fokko
approved these changes
Feb 6, 2020
feluelle
approved these changes
Feb 6, 2020
Thanks for the good explanation. I was about to ask why you put this in two commits - now I get it 👍 |
ashb
added a commit
to astronomer/airflow
that referenced
this pull request
Feb 6, 2020
* [AIRFLOW-6733] Extend, rather than replace, the base_template This commit just moves the existing template to airflow/master.html (without further changes) * [AIRFLOW-6733] Only change blocks we have customized This makes is easier to see which parts of the template we have changed. (cherry picked from commit 220bc0e)
galuszkak
pushed a commit
to FlyrInc/apache-airflow
that referenced
this pull request
Mar 5, 2020
* [AIRFLOW-6733] Extend, rather than replace, the base_template This commit just moves the existing template to airflow/master.html (without further changes) * [AIRFLOW-6733] Only change blocks we have customized This makes is easier to see which parts of the template we have changed.
kaxil
added a commit
to astronomer/airflow
that referenced
this pull request
Mar 30, 2020
cherry-picked from 220bc0e
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We had copied whole-sale the baselayout.html from FAB and customized it, but pre-existing mechanism in flask/jinja of template inheritance means we don't have to do this.
We can instead extend the template from FAB and change the few blocks we need to.
I have written this PR as two commits -- one to move the file without any changes (we can't extend
appbuilder/baselayout.html
from FAB while our file exists, as that is "earlier" in the template search path) and then a second commit that keeps just the blocks we have extended/changed.Issue link: AIRFLOW-6733
Make sure to mark the boxes below before creating PR: [x]
[AIRFLOW-NNNN]
. AIRFLOW-NNNN = JIRA ID** 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.