Fixed to check state for only open pull-request

* This commit prevents checking merge state for closed or already merged pull-requests.
naver · Jan 12, 2015 · 790d76e · 790d76e
1 parent 7573ef4
commit 790d76e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/app/views/git/create.scala.html b/app/views/git/create.scala.html
@@ -82,6 +82,7 @@
                     <!-- // -->
                 </div>
 
+                <span id="pullRequestState" data-value="@pullRequest.state"></span>
                 <div id="status" class="alert mt20 mb20">
                     @Messages("pullRequest.is.merging")
                 </div>
@@ -131,7 +132,8 @@
         "fromProject" : $("#fromProjectId"),
         "toProject"   : $("#toProjectId"),
         "fromBranch"  : $("#fromBranch"),
-        "toBranch"    : $("#toBranch")
+        "toBranch"    : $("#toBranch"),
+        "state"       : $("#pullRequestState").data("value")
     });
 
     // yobi.Mention

diff --git a/app/views/git/edit.scala.html b/app/views/git/edit.scala.html
@@ -81,9 +81,12 @@
                     <!-- // -->
                 </div>
 
-                <div id="status" class="alert mt20 mb20">
-                    @Messages("pullRequest.is.merging")
-                </div>
+                <span id="pullRequestState" data-value="@pullRequest.state"></span>
+                @if(pullRequest.isOpen) {
+                    <div id="status" class="alert mt20 mb20">
+                        @Messages("pullRequest.is.merging")
+                    </div>
+                }
 
                 <div>
                     <input type="text" id="title" name="title" maxlength="255" class="text"
@@ -131,7 +134,8 @@
         "fromProject" : $("#fromProjectId"),
         "toProject"   : $("#toProjectId"),
         "fromBranch"  : $("#fromBranch"),
-        "toBranch"    : $("#toBranch")
+        "toBranch"    : $("#toBranch"),
+        "state"       : $("#pullRequestState").data("value")
     });
 
     // yobi.Mention

diff --git a/public/javascripts/service/yobi.git.Write.js b/public/javascripts/service/yobi.git.Write.js
@@ -32,9 +32,7 @@
             _initVar(options);
             _initElement(options);
             _attachEvent();
-
             _initFileUploader();
-            _onChangeBranch();
         }
 
         /**
@@ -59,6 +57,7 @@
             elements.fromBranch  = options.fromBranch;
             elements.toProject   = options.toProject;
             elements.toBranch    = options.toBranch;
+            elements.state       = options.state;
 
             elements.uploader = $("#upload");
             elements.numOfCommits = $("#numOfCommits");
@@ -85,6 +84,10 @@
             $(document.body).on("click", "button.moreBtn", function(){
                 $(this).next("pre.commitMsg.desc").toggleClass("hidden");
             });
+
+            if(elements.state === "OPEN") {
+                _onChangeBranch();
+            }
         }
 
         /**