Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 21:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2115 from gitbucket/fix-file-remove

Browse Source 
BugFix for the file remove page
This commit is contained in:
Naoki Takezoe
2018-07-23 10:58:07 +09:00
committed by GitHub
parent 78fbeb67d4 bb59cbcb91
commit f0129a3d4d
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View File

@@ -427,8 +427,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
commit = form.commit commit = form.commit
) )
println(form.path)
redirect( redirect(
s"/${repository.owner}/${repository.name}/tree/${form.branch}${if (form.path.length == 0) "" else form.path}" s"/${repository.owner}/${repository.name}/tree/${form.branch}${if (form.path.length == 0) "" else "/" + form.path}"
) )
}) })

4
src/main/twirl/gitbucket/core/helper/diff.scala.html
View File

@@ -103,8 +103,8 @@
} else { } else {
@if(diff.newContent != None || diff.oldContent != None){ @if(diff.newContent != None || diff.oldContent != None){
<div id="diffText-@i" class="diffText"></div> <div id="diffText-@i" class="diffText"></div>
<textarea id="newText-@i" style="display: none;" data-file-name="@diff.oldPath" data-val='@diff.newContent.getOrElse("")'></textarea> <input type="hidden" id="newText-@i" data-file-name="@diff.oldPath" value="@diff.newContent">
<textarea id="oldText-@i" style="display: none;" data-file-name="@diff.newPath" data-val='@diff.oldContent.getOrElse("")'></textarea> <input type="hidden" id="oldText-@i" data-file-name="@diff.newPath" value="@diff.oldContent">
} else { } else {
@if(diff.newIsImage || diff.oldIsImage){ @if(diff.newIsImage || diff.oldIsImage){
<div class="diff-image-render diff2up"> <div class="diff-image-render diff2up">

6
src/main/twirl/gitbucket/core/repo/delete.scala.html
View File

@@ -32,8 +32,8 @@
<tr> <tr>
<td> <td>
<div id="diffText"></div> <div id="diffText"></div>
<textarea id="newText" style="display: none;" data-file-name="@fileName"></textarea> <input type="hidden" id="newText" data-file-name="@fileName" value="">
<textarea id="oldText" style="display: none;" data-file-name="@fileName">@content.content</textarea> <input type="hidden" id="oldText" data-file-name="@fileName" value="@content.content">
</td> </td>
</tr> </tr>
</table> </table>
@@ -46,7 +46,7 @@
<input type="text" name="message" class="form-control"/> <input type="text" name="message" class="form-control"/>
</div> </div>
<div style="text-align: right;"> <div style="text-align: right;">
<a href="@helpers.url(repository)/blob/@helpers.encodeRefName((branch :: pathList).mkString("/"))" class="btn btn-default">Cancel</a> <a href="@helpers.url(repository)/blob/@helpers.encodeRefName((branch :: pathList ::: List(fileName)).mkString("/"))" class="btn btn-default">Cancel</a>
<input type="submit" id="commitButton" class="btn btn-success" value="Commit changes"/> <input type="submit" id="commitButton" class="btn btn-success" value="Commit changes"/>
</div> </div>
</div> </div>

4
src/main/webapp/assets/common/js/gitbucket.js
View File

@@ -78,9 +78,9 @@ function displayErrors(data, elem){
function diffUsingJS(oldTextId, newTextId, outputId, viewType, ignoreSpace) { function diffUsingJS(oldTextId, newTextId, outputId, viewType, ignoreSpace) {
var old = $('#'+oldTextId), head = $('#' + newTextId); var old = $('#'+oldTextId), head = $('#' + newTextId);
var render = new JsDiffRender({ var render = new JsDiffRender({
oldText: old.attr('data-val'), oldText: old.val(),
oldTextName: old.attr('data-file-name'), oldTextName: old.attr('data-file-name'),
newText: head.attr('data-val'), newText: head.val(),
newTextName: head.attr('data-file-name'), newTextName: head.attr('data-file-name'),
ignoreSpace: ignoreSpace, ignoreSpace: ignoreSpace,
contextSize: 4 contextSize: 4