mirror of https://github.com/halo-dev/halo
fix: new tags showing null post count on theme (#7049)
#### What type of PR is this? /kind improvement /area core /milestone 2.20.x #### What this PR does / why we need it: 修复新创建的标签在主题端展示关联文章数量为 null 的问题 #### Which issue(s) this PR fixes: Fixes #7042 #### Does this PR introduce a user-facing change? ```release-note 修复新创建的标签在主题端展示关联文章数量为 null 的问题 ```pull/7057/head
parent
2c8f6f5009
commit
7cef55b51f
|
@ -52,10 +52,17 @@ public class TagReconciler implements Reconciler<Reconciler.Request> {
|
||||||
String newPattern = tagPermalinkPolicy.pattern();
|
String newPattern = tagPermalinkPolicy.pattern();
|
||||||
annotations.put(Constant.PERMALINK_PATTERN_ANNO, newPattern);
|
annotations.put(Constant.PERMALINK_PATTERN_ANNO, newPattern);
|
||||||
|
|
||||||
String permalink = tagPermalinkPolicy.permalink(tag);
|
|
||||||
var status = tag.getStatusOrDefault();
|
var status = tag.getStatusOrDefault();
|
||||||
|
String permalink = tagPermalinkPolicy.permalink(tag);
|
||||||
status.setPermalink(permalink);
|
status.setPermalink(permalink);
|
||||||
|
|
||||||
|
if (status.getPostCount() == null) {
|
||||||
|
status.setPostCount(0);
|
||||||
|
}
|
||||||
|
if (status.getVisiblePostCount() == null) {
|
||||||
|
status.setVisiblePostCount(0);
|
||||||
|
}
|
||||||
|
|
||||||
// Update the observed version.
|
// Update the observed version.
|
||||||
status.setObservedVersion(tag.getMetadata().getVersion() + 1);
|
status.setObservedVersion(tag.getMetadata().getVersion() + 1);
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package run.halo.app.theme.finders.vo;
|
package run.halo.app.theme.finders.vo;
|
||||||
|
|
||||||
|
import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
|
||||||
|
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Value;
|
import lombok.Value;
|
||||||
import run.halo.app.core.extension.content.Tag;
|
import run.halo.app.core.extension.content.Tag;
|
||||||
|
@ -33,7 +35,7 @@ public class TagVo implements ExtensionVoOperator {
|
||||||
.metadata(tag.getMetadata())
|
.metadata(tag.getMetadata())
|
||||||
.spec(spec)
|
.spec(spec)
|
||||||
.status(status)
|
.status(status)
|
||||||
.postCount(tag.getStatusOrDefault().getVisiblePostCount())
|
.postCount(defaultIfNull(status.getVisiblePostCount(), 0))
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue