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.

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

Jump to bottom

fix: not using the default template when the custom template does not exist #4618

Merged
merged 4 commits into from
Sep 22, 2023
Merged

fix: not using the default template when the custom template does not exist #4618

merged 4 commits into from
Sep 22, 2023

Conversation

guqing
Copy link
Member

@guqing guqing commented Sep 18, 2023

What type of PR is this?

/kind bug
/area core
/milestone 2.10.x

What this PR does / why we need it:

修复文章自定义模板不存在时没有使用默认模板的问题

see #4617 for more details.

Which issue(s) this PR fixes:

Fixes #4617

Does this PR introduce a user-facing change?

修复文章自定义模板不存在时没有使用默认模板的问题

@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. labels Sep 18, 2023
@f2c-ci-robot f2c-ci-robot bot added this to the 2.10.x milestone Sep 18, 2023
@f2c-ci-robot f2c-ci-robot bot requested review from minliacom and ruibaby September 18, 2023 03:51
@f2c-ci-robot f2c-ci-robot bot added the area/core Issues or PRs related to the Halo Core label Sep 18, 2023
@guqing
Copy link
Member Author

guqing commented Sep 18, 2023

/cherry-pick release-2.9

@halo-dev-bot
Copy link
Collaborator

@guqing: once the present PR merges, I will cherry-pick it on top of release-2.9 in a new PR and assign it to you.

In response to this:

/cherry-pick release-2.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@codecov
Copy link

codecov bot commented Sep 18, 2023 •
edited
Loading

Codecov Report

Merging #4618 (ea4d725) into main (da2d56e) will increase coverage by 0.06%.
Report is 9 commits behind head on main.
The diff coverage is 91.66%.

@@             Coverage Diff              @@
##               main    #4618      +/-   ##
============================================
+ Coverage     61.04%   61.11%   +0.06%     
- Complexity     2566     2571       +5     
============================================
  Files           374      374              
  Lines         13168    13173       +5     
  Branches        938      939       +1     
============================================
+ Hits           8039     8051      +12     
+ Misses         4676     4669       -7     
  Partials        453      453
Files Changed Coverage Δ
...va/run/halo/app/theme/router/ViewNameResolver.java 85.71% <91.66%> (+2.38%) ⬆️

... and 1 file with indirect coverage changes

ruibaby
ruibaby reviewed Sep 18, 2023
View reviewed changes
Copy link
Member

@ruibaby ruibaby left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Sep 18, 2023
@f2c-ci-robot f2c-ci-robot bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 22, 2023
JohnNiang
JohnNiang approved these changes Sep 22, 2023
View reviewed changes
Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@f2c-ci-robot f2c-ci-robot bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 22, 2023
@f2c-ci-robot f2c-ci-robot bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 22, 2023
JohnNiang
JohnNiang approved these changes Sep 22, 2023
View reviewed changes
Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Sep 22, 2023
@f2c-ci-robot
Copy link

f2c-ci-robot bot commented Sep 22, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@JohnNiang JohnNiang merged commit 2d5e7bd into halo-dev:main Sep 22, 2023
2 checks passed
@halo-dev-bot
Copy link
Collaborator

@guqing: new pull request created: #4648

In response to this:

/cherry-pick release-2.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@halo-dev-bot halo-dev-bot mentioned this pull request Sep 22, 2023
Merged
f2c-ci-robot bot pushed a commit that referenced this pull request Sep 22, 2023
@halo-dev-bot
[release-2.9] fix: not using the default template when the custom tem…
5a34fb5 
…plate does not exist (#4648)

This is an automated cherry-pick of #4618

/assign guqing

```release-note
修复文章自定义模板不存在时没有使用默认模板的问题
```
@ruibaby ruibaby modified the milestones: 2.10.x, 2.10.0 Sep 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruibaby ruibaby ruibaby left review comments

@JohnNiang JohnNiang JohnNiang approved these changes

@minliacom minliacom Awaiting requested review from minliacom

Assignees

@JohnNiang JohnNiang

@ruibaby ruibaby

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/core Issues or PRs related to the Halo Core kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Milestone
2.10.0
Development

Successfully merging this pull request may close these issues.

当文章自定义模板不存在时，应该使用默认的模板进行渲染
4 participants
@guqing @halo-dev-bot @JohnNiang @ruibaby