deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Task #735 Automerge should not be checked on every load of MR show page

Browse source
This commit is contained in:
Valery Sizov 2012-04-27 00:53:55 +03:00
parent 28cb43135c
commit 43dcc9575a
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/assets/javascripts/merge_requests.js
View file

@ -5,12 +5,13 @@ var MergeRequest = {
init: init:
function(opts) { function(opts) {
this.opts = opts; var self = this;
self.opts = opts;
if($(".automerge_widget").length){ self.showState(self.opts.current_state);
if($(".automerge_widget").length && self.opts.check_enable){
$.get(opts.url_to_automerge_check, function(data){ $.get(opts.url_to_automerge_check, function(data){
$(".automerge_widget").hide(); self.showState(data.state);
$(".automerge_widget." + data.state).show();
}, "json"); }, "json");
} }
@ -35,6 +36,13 @@ var MergeRequest = {
}); });
}, },
showState:
function(state){
$(".automerge_widget").hide();
$(".automerge_widget." + state).show();
},
loadDiff: loadDiff:
function() { function() {
$(".dashboard-loader").show(); $(".dashboard-loader").show();

2
app/views/merge_requests/show.html.haml
View file

@ -101,6 +101,8 @@
$(function(){ $(function(){
MergeRequest.init({ MergeRequest.init({
url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}", url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
check_enable: #{@merge_request.state == MergeRequest::UNCHECKED ? "true" : "false"},
current_state: "#{@merge_request.human_state}"
}); });
$(".accept_merge_request").live("ajax:beforeSend", function() { $(".accept_merge_request").live("ajax:beforeSend", function() {