Skip to content

Commit 15fbf50

Browse files
jolheiserjolheiser
authored
Org action fixes and form cleanup (#10512)
* More org fixes * Move form action query to inputs Signed-off-by: jolheiser <john.olheiser@gmail.com>
1 parent 90919bb commit 15fbf50

File tree

6 files changed

+26
-15
lines changed

6 files changed

+26
-15
lines changed

‎templates/org/member/members.tmpl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,15 @@
5454
<div class="ui four wide column">
5555
<div class="text right">
5656
{{if eq $.SignedUser.ID .ID}}
57-
<a class="ui red small button" href="{{$.OrgLink}}/members/action/leave?uid={{.ID}}">{{$.i18n.Tr "org.members.leave"}}</a>
57+
<form method="post" action="{{$.OrgLink}}/members/action/leave">
58+
{{$.CsrfTokenHtml}}
59+
<button type="submit" class="ui red small button" name="uid" value="{{.ID}}">{{$.i18n.Tr "org.members.leave"}}</button>
60+
</form>
5861
{{else if $.IsOrganizationOwner}}
59-
<a class="ui red small button" href="{{$.OrgLink}}/members/action/remove?uid={{.ID}}">{{$.i18n.Tr "org.members.remove"}}</a>
62+
<form method="post" action="{{$.OrgLink}}/members/action/remove">
63+
{{$.CsrfTokenHtml}}
64+
<button type="submit" class="ui red small button" name="uid" value="{{.ID}}">{{$.i18n.Tr "org.members.remove"}}</button>
65+
</form>
6066
{{end}}
6167
</div>
6268
</div>

‎templates/org/team/members.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
{{range .Team.Members}}
2828
<div class="item">
2929
{{if $.IsOrganizationOwner}}
30-
<form method="post" action="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/remove?uid={{.ID}}">
30+
<form method="post" action="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/remove">
3131
{{$.CsrfTokenHtml}}
32-
<button type="submit" class="ui red small button right" >{{$.i18n.Tr "org.members.remove"}}</button>
32+
<button type="submit" class="ui red small button right" name="uid" value="{{.ID}}">{{$.i18n.Tr "org.members.remove"}}</button>
3333
</form>
3434
{{end}}
3535
<a href="{{.HomeLink}}">

‎templates/org/team/repositories.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
{{range .Team.Repos}}
3636
<div class="item">
3737
{{if $canAddRemove}}
38-
<form method="post" action="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/repo/remove?repoid={{.ID}}">
38+
<form method="post" action="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/repo/remove">
3939
{{$.CsrfTokenHtml}}
40-
<button type="submit" class="ui red small button right">{{$.i18n.Tr "remove"}}</button>
40+
<button type="submit" class="ui red small button right" name="repoid" value="{{.ID}}">{{$.i18n.Tr "remove"}}</button>
4141
</form>
4242
{{end}}
4343
<a class="member" href="{{AppSubUrl}}/{{$.Org.Name}}/{{.Name}}">

‎templates/org/team/sidebar.tmpl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
<strong>{{.Team.Name}}</strong>
44
<div class="ui right">
55
{{if .Team.IsMember $.SignedUser.ID}}
6-
<form method="post" action="{{.OrgLink}}/teams/{{.Team.LowerName}}/action/leave?uid={{$.SignedUser.ID}}&page=home">
6+
<form method="post" action="{{.OrgLink}}/teams/{{.Team.LowerName}}/action/leave">
77
{{$.CsrfTokenHtml}}
8-
<button type="submit" class="ui red tiny button">{{$.i18n.Tr "org.teams.leave"}}</button>
8+
<input type="hidden" name="page" value="home"/>
9+
<button type="submit" class="ui red tiny button" name="uid" value="{{$.SignedUser.ID}}">{{$.i18n.Tr "org.teams.leave"}}</button>
910
</form>
1011
{{else if .IsOrganizationOwner}}
11-
<form method="post" action="{{.OrgLink}}/teams/{{.Team.LowerName}}/action/join?uid={{$.SignedUser.ID}}&page=team">
12+
<form method="post" action="{{.OrgLink}}/teams/{{.Team.LowerName}}/action/join">
1213
{{$.CsrfTokenHtml}}
13-
<button type="submit" class="ui blue tiny button">{{$.i18n.Tr "org.teams.join"}}</button>
14+
<input type="hidden" name="page" value="team"/>
15+
<button type="submit" class="ui blue tiny button" name="uid" value="{{$.SignedUser.ID}}">{{$.i18n.Tr "org.teams.join"}}</button>
1416
</form>
1517
{{end}}
1618
</div>

‎templates/org/team/teams.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
<a class="text black" href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.Name}}</strong></a>
1818
<div class="ui right">
1919
{{if .IsMember $.SignedUser.ID}}
20-
<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName}}/action/leave?uid={{$.SignedUser.ID}}">
20+
<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName}}/action/leave">
2121
{{$.CsrfTokenHtml}}
22-
<button type="submit" class="ui red small button">{{$.i18n.Tr "org.teams.leave"}}</button>
22+
<button type="submit" class="ui red small button" name="uid" value="{{$.SignedUser.ID}}">{{$.i18n.Tr "org.teams.leave"}}</button>
2323
</form>
2424
{{else if $.IsOrganizationOwner}}
25-
<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName}}/action/join?uid={{$.SignedUser.ID}}">
25+
<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName}}/action/join">
2626
{{$.CsrfTokenHtml}}
27-
<button type="submit" class="ui blue small button">{{$.i18n.Tr "org.teams.join"}}</button>
27+
<button type="submit" class="ui blue small button" name="uid" value="{{$.SignedUser.ID}}">{{$.i18n.Tr "org.teams.join"}}</button>
2828
</form>
2929
{{end}}
3030
</div>

‎templates/user/settings/organization.tmpl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
{{range .Orgs}}
1818
<div class="item">
1919
<div class="right floated content">
20-
<a class="ui blue small button" href="{{AppSubUrl}}/org/{{.Name}}/members/action/leave?uid={{.ID}}">{{$.i18n.Tr "org.members.leave"}}</a>
20+
<form method="post" action="{{AppSubUrl}}/org/{{.Name}}/members/action/leave">
21+
{{$.CsrfTokenHtml}}
22+
<button type="submit" class="ui blue small button" name="uid" value="{{.ID}}">{{$.i18n.Tr "org.members.leave"}}</button>
23+
</form>
2124
</div>
2225
<img class="ui mini image" src="{{.RelAvatarLink}}">
2326
<div class="content">

0 commit comments

Comments
 (0)