diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-07 22:39:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-07 09:39:08 -0500 |
| commit | 36c0840cf1696912b1872cfa4ebc4b241dabd693 (patch) | |
| tree | c3951e2bb0f1723043bd7fdcec0ab50c19d6ef3e /templates/user | |
| parent | 5b89670a318e52e271f65d96bfe1116d85d20988 (diff) | |
| download | gitea-36c0840cf1696912b1872cfa4ebc4b241dabd693.tar.gz gitea-36c0840cf1696912b1872cfa4ebc4b241dabd693.zip | |
Merge template functions "dict/Dict/mergeinto" (#23932)
One of the steps in #23328
Before there were 3 different but similar functions: dict/Dict/mergeinto
The code was just copied & pasted, no test.
This PR defines a new stable `dict` function, it covers all the 3 old
functions behaviors, only +160 -171
Future developers do not need to think about or guess the different dict
functions, just use one: `dict`
Why use `dict` but not `Dict`? Because there are far more `dict` than
`Dict` in code already ......
Diffstat (limited to 'templates/user')
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/notification/notification_subscriptions.tmpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 88ab1f9b73..6b9bfe4eba 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -112,7 +112,7 @@ {{end}} </div> </div> - {{template "shared/issuelist" mergeinto . "listType" "dashboard"}} + {{template "shared/issuelist" dict "." . "listType" "dashboard"}} </div> </div> </div> diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index 5aff7ef9d6..26a33bf9ba 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -66,7 +66,7 @@ <div class="ui divider"></div> {{.locale.Tr "notification.no_subscriptions"}} {{else}} - {{template "shared/issuelist" mergeinto . "listType" "dashboard"}} + {{template "shared/issuelist" dict "." . "listType" "dashboard"}} {{end}} {{else}} {{template "explore/repo_search" .}} |