troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-27 21:03:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Do not disable commit changes button on repost (#12644)

Browse source 
If the user has pressed commit changes and the post has failed - do not disable
the commit changes button.

Fix #12072

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2020-08-29 22:32:46 +01:00 committed by GitHub
parent 9abc16a280
commit 17fbbe97d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
routers/repo/editor.go
View file

@ -184,6 +184,7 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo
} }
ctx.Data["PageIsEdit"] = true ctx.Data["PageIsEdit"] = true
ctx.Data["PageHasPosted"] = true
ctx.Data["IsNewFile"] = isNewFile ctx.Data["IsNewFile"] = isNewFile
ctx.Data["RequireHighlightJS"] = true ctx.Data["RequireHighlightJS"] = true
ctx.Data["RequireSimpleMDE"] = true ctx.Data["RequireSimpleMDE"] = true

1
templates/repo/editor/edit.tmpl
View file

@ -6,6 +6,7 @@
<form class="ui edit form" method="post"> <form class="ui edit form" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<input type="hidden" name="last_commit" value="{{.last_commit}}"> <input type="hidden" name="last_commit" value="{{.last_commit}}">
<input type="hidden" name="page_has_posted" value="{{.PageHasPosted}}">
<div class="ui secondary menu"> <div class="ui secondary menu">
<div class="fitted item treepath"> <div class="fitted item treepath">
<div class="ui breadcrumb field {{if .Err_TreePath}}error{{end}}"> <div class="ui breadcrumb field {{if .Err_TreePath}}error{{end}}">

4
web_src/js/index.js
View file

@ -1592,7 +1592,9 @@ async function initEditor() {
const dirtyFileClass = 'dirty-file'; const dirtyFileClass = 'dirty-file';
// Disabling the button at the start // Disabling the button at the start
$commitButton.prop('disabled', true); if ($('input[name="page_has_posted"]').val() !== 'true') {
$commitButton.prop('disabled', true);
}
// Registering a custom listener for the file path and the file content // Registering a custom listener for the file path and the file content
$editForm.areYouSure({ $editForm.areYouSure({