Fix .locale.Tr function not found in delete modal

[delvh]

Caught by @wxiaoguang in #23337 (comment).

Additionally, there were three instances that have the same content as templates/base/deletion_modal_actions.tmpl, but that are not intended to delete something.
Instead of renaming the template above, these instances were simply re-hard-coded again.
Renaming/improving the template above is left for future PRs.

[wxiaoguang]

I guess this change equals before. Because in this template, .xx is $.xx

[wxiaoguang]

Just have a try, I see the error message:

template: base/delete_modal_actions:4:5: executing "base/delete_modal_actions" at <$.locale.Tr>: can't evaluate field locale in type string,

it's $.locale.Tr now 😂

[delvh]

As far as I've understood Go templates (please correct me if I misunderstood something):
.something is the attribute x.something when you use {{template "<another>" x}}.
$.something is the global value set with ctx.Data["something"].
Is that correct, or is there yet another thing I have to learn about the templates?

[wxiaoguang]

In a template, $.xx is accessing the root/top scope. .xx is accessing current range/with scope.

So, if we write $.xx or .xx in root/top scope , they are the same.

I guess the problem is caused by that this sub-template is called inside a range scope by {{template "actions" .}}. Actually, it needs to access top scope to get the locale: try to use {{template "actions" $}}?

[delvh]

@wxiaoguang unfortunately, I was never able to see the dialogue, not even during #23337.
So, could you please tell me if it now works?

[wxiaoguang]

I just navigated to the page http://localhost:3000/user/settings/repos , let me see ....

[wxiaoguang]

I guess the fix could be like this:

diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 2e107ca7f..d1cb60225 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -50,7 +50,7 @@
                                                                                                                {{$.CsrfTokenHtml}}
                                                                                                                <input type="hidden" name="id" value="{{$dir}}">
                                                                                                                <input type="hidden" name="action" value="adopt">
-                                                                                                               {{template "base/delete_modal_actions" .}}
+                                                                                                               {{template "base/delete_modal_actions" $}}
                                                                                                        </form>
                                                                                                </div>
                                                                                        {{end}}
@@ -68,7 +68,7 @@
                                                                                                                {{$.CsrfTokenHtml}}
                                                                                                                <input type="hidden" name="id" value="{{$dir}}">
                                                                                                                <input type="hidden" name="action" value="delete">
-                                                                                                               {{template "base/delete_modal_actions" .}}
+                                                                                                               {{template "base/delete_modal_actions" $}}
                                                                                                        </form>
                                                                                                </div>
                                                                                        {{end}}

[wxiaoguang]

Hmm , I think I know your question now .... some pages are for special usage, for example, adopt repositories, adopt lfs files, etc. You need to have some unadopted repositories to make Gitea render that UI.

I did a global search, I can find there are also similar problems in templates/admin/repo/unadopted.tmpl : {{range}} => {{template "actions" .}}.

So I guess there are 4 lines need to be changed: 2 lines in unadopted.tmpl, 2 lines in templates/user/settings/repos.tmpl

---

And I find one more possible problem, the template name delete_modal_actions is not accurate, for example, in the unadopted.tmpl, these yes/no buttons are also used to confirm to adopt, but not to delete.

[delvh]

Yep, and I agree that all three other times, delete is not the correct method, so I de-converted these instances now.
(Another approach would be to rename the dialogue, but I would leave that for another PR of its own)

[silverwind]

Why not make another subtemplate with the trash icon? 3 repetitions is already worthy of a subtemplate.

[wxiaoguang]

It just need a rename.

Rename the delete_modal_actions to modal_actions_yes_no

[delvh]

I wanted to postpone this for a future PR, but yeah, we can of course do it in this one too…

[wxiaoguang]

Either is fine, fix bugs first 😁

[jolheiser]

🎺 (for merge queue)