Skip to content

Commit e8b9909

Browse files
wxiaoguangGiteaBot
andauthored
Make "link-action" backend code respond correct JSON content (#26680)
Otherwise the `link-action` JS code couldn't parse the response. Co-authored-by: Giteabot <[email protected]>
1 parent af33a11 commit e8b9909

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

routers/web/admin/users.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,5 +480,5 @@ func DeleteAvatar(ctx *context.Context) {
480480
ctx.Flash.Error(err.Error())
481481
}
482482

483-
ctx.Redirect(setting.AppSubURL + "/admin/users/" + strconv.FormatInt(u.ID, 10))
483+
ctx.JSONRedirect(setting.AppSubURL + "/admin/users/" + strconv.FormatInt(u.ID, 10))
484484
}

routers/web/org/setting.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func SettingsDeleteAvatar(ctx *context.Context) {
156156
ctx.Flash.Error(err.Error())
157157
}
158158

159-
ctx.Redirect(ctx.Org.OrgLink + "/settings")
159+
ctx.JSONRedirect(ctx.Org.OrgLink + "/settings")
160160
}
161161

162162
// SettingsDelete response for deleting an organization

routers/web/repo/setting/avatar.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ func SettingsDeleteAvatar(ctx *context.Context) {
7272
if err := repo_service.DeleteAvatar(ctx, ctx.Repo.Repository); err != nil {
7373
ctx.Flash.Error(fmt.Sprintf("DeleteAvatar: %v", err))
7474
}
75-
ctx.Redirect(ctx.Repo.RepoLink + "/settings")
75+
ctx.JSONRedirect(ctx.Repo.RepoLink + "/settings")
7676
}

routers/web/user/setting/profile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func DeleteAvatar(ctx *context.Context) {
194194
ctx.Flash.Error(err.Error())
195195
}
196196

197-
ctx.Redirect(setting.AppSubURL + "/user/settings")
197+
ctx.JSONRedirect(setting.AppSubURL + "/user/settings")
198198
}
199199

200200
// Organization render all the organization of the user

templates/admin/user/edit.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186

187187
<div class="field">
188188
<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
189-
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete" data-redirect="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
189+
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
190190
</div>
191191
</form>
192192
</div>

templates/org/settings/options.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494

9595
<div class="field">
9696
<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
97-
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete" data-redirect="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
97+
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
9898
</div>
9999
</form>
100100
</div>

templates/repo/settings/options.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</div>
5959
<div class="field">
6060
<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
61-
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete" data-redirect="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
61+
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
6262
</div>
6363
</form>
6464
</div>

templates/user/settings/profile.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126

127127
<div class="field">
128128
<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
129-
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete" data-redirect="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
129+
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
130130
</div>
131131
</form>
132132
</div>

0 commit comments

Comments
 (0)