Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-12 16:35:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge checking

Browse Source
This commit is contained in:
Naoki Takezoe
2015-08-23 02:17:46 +09:00
parent fdd9a184b5
commit 2222299793
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/twirl/gitbucket/core/pulls/compare.scala.html
View File

@@ -190,16 +190,16 @@ $(function(){
@if(members.isEmpty){ @if(members.isEmpty){
location.href = '@url(repository)/compare/' + location.href = '@url(repository)/compare/' +
$.trim($('i.icon-ok').parents('a.origin-branch').data('branch')) + '...' + $.trim($('i.octicon-check').parents('a.origin-branch').data('branch')) + '...' +
$.trim($('i.icon-ok').parents('a.forked-branch').data('branch')); $.trim($('i.octicon-check').parents('a.forked-branch').data('branch'));
} else { } else {
location.href = '@path/' + location.href = '@path/' +
$.trim($('i.icon-ok').parents('a.forked-owner' ).data('owner')) + '/' + $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + '/' +
$.trim($('i.icon-ok').parents('a.forked-owner' ).data('name')) +'/compare/' + $.trim($('i.octicon-check').parents('a.forked-owner' ).data('name')) +'/compare/' +
$.trim($('i.icon-ok').parents('a.origin-owner' ).data('owner')) + ':' + $.trim($('i.octicon-check').parents('a.origin-owner' ).data('owner')) + ':' +
$.trim($('i.icon-ok').parents('a.origin-branch').data('branch')) + '...' + $.trim($('i.octicon-check').parents('a.origin-branch').data('branch')) + '...' +
$.trim($('i.icon-ok').parents('a.forked-owner' ).data('owner')) + ':' + $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + ':' +
$.trim($('i.icon-ok').parents('a.forked-branch').data('branch')); $.trim($('i.octicon-check').parents('a.forked-branch').data('branch'));
} }
}); });
@@ -214,21 +214,21 @@ $(function(){
@if(hasForkedWritePermission){ @if(hasForkedWritePermission){
function checkConflict(from, to){ function checkConflict(from, to){
$('.check-conflict').show(); $('.check-conflict').show();
$.get('@url(repository)/compare/' + from + '...' + to + '/mergecheck', $.get('@url(forkedRepository)/compare/' + from + '...' + to + '/mergecheck',
function(data){ $('.check-conflict').html(data); }); function(data){ $('.check-conflict').html(data); });
} }
@if(members.isEmpty){ @if(members.isEmpty){
checkConflict( checkConflict(
$.trim($('i.icon-ok').parents('a.origin-branch').data('branch')), $.trim($('i.octicon-check').parents('a.origin-branch').data('branch')),
$.trim($('i.icon-ok').parents('a.forked-branch').data('branch')) $.trim($('i.octicon-check').parents('a.forked-branch').data('branch'))
); );
} else { } else {
checkConflict( checkConflict(
$.trim($('i.icon-ok').parents('a.origin-owner' ).data('owner')) + ":" + $.trim($('i.octicon-check').parents('a.origin-owner' ).data('owner')) + ":" +
$.trim($('i.icon-ok').parents('a.origin-branch').data('branch')), $.trim($('i.octicon-check').parents('a.origin-branch').data('branch')),
$.trim($('i.icon-ok').parents('a.forked-owner' ).data('owner')) + ":" + $.trim($('i.octicon-check').parents('a.forked-owner' ).data('owner')) + ":" +
$.trim($('i.icon-ok').parents('a.forked-branch').data('branch')) $.trim($('i.octicon-check').parents('a.forked-branch').data('branch'))
); );
} }
} }