From d61ab632f1119c57a25912a1d089a1ab2ce345f5 Mon Sep 17 00:00:00 2001
From: nazoking <nazoking@gmail.com>
Date: Mon, 23 May 2016 15:31:39 +0900
Subject: [PATCH] fix #1192 Cannot disable option "Require status checks to
 pass before merging"

---
 .../core/api/ApiBranchProtection.scala        |  3 +-
 .../core/settings/branchprotection.scala.html | 34 +++++++++++--------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/main/scala/gitbucket/core/api/ApiBranchProtection.scala b/src/main/scala/gitbucket/core/api/ApiBranchProtection.scala
index 6554e0812..dc452ebb2 100644
--- a/src/main/scala/gitbucket/core/api/ApiBranchProtection.scala
+++ b/src/main/scala/gitbucket/core/api/ApiBranchProtection.scala
@@ -14,7 +14,7 @@ object ApiBranchProtection{
 
   def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection = ApiBranchProtection(
     enabled = info.enabled,
-    required_status_checks = Some(Status(EnforcementLevel(info.enabled, info.includeAdministrators), info.contexts)))
+    required_status_checks = Some(Status(EnforcementLevel(info.enabled && info.contexts.nonEmpty, info.includeAdministrators), info.contexts)))
   val statusNone = Status(Off, Seq.empty)
   case class Status(enforcement_level: EnforcementLevel, contexts: Seq[String])
   sealed class EnforcementLevel(val name: String)
@@ -44,4 +44,3 @@ object ApiBranchProtection{
    }
  ))
 }
-
diff --git a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
index 083375736..fb57d92d2 100644
--- a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
@@ -26,23 +26,19 @@
             </div>
             <div class="checkbox js-enabled" style="display:none">
               <label>
-                <input type="checkbox" name="has_required_statuses" onclick="update()" @check(protection.status.enforcement_level.name!="off")>
+                <input type="checkbox" name="has_required_statuses" onclick="update()" @check(protection.status.enforcement_level.name!="off") @if(knownContexts.isEmpty){disabled }>
                 <span class="strong">Require status checks to pass before merging</span>
               </label>
-              <p class="help-block">Choose which status checks must pass before branches can be merged into test.
-              When enabled, commits must first be pushed to another branch, then merged or pushed directly to test after status checks have passed.</p>
-
-              <div class="js-has_required_statuses" style="display:none">
-                <div class="checkbox">
-                  <label>
-                    <input type="checkbox" name="enforce_for_admins" onclick="update()" @check(protection.status.enforcement_level.name=="everyone")>
-                    <span class="strong">Include administrators</span>
-                  </label>
-                  <p class="help-block">Enforce required status checks for repository administrators.</p>
+              <p class="help-block">When enabled, commits must first be pushed to another branch, then merged or pushed directly to <b>@branch</b> after status checks have passed.</p>
+              @if( knownContexts.isEmpty ){
+                <div class="alert alert-warning">
+                  Sorry, we couldn’t find any status checks in the last week for this repository.<br />
+                  Please create a commit status by API (<a href="https://developer.github.com/v3/repos/statuses/">Learn more about status checks on GitHub</a>)
                 </div>
-
+              }else{
+              <div class="js-has_required_statuses" style="display:none">
                 <div class="panel panel-default">
-                  <div class="panel-heading">Status checks found in the last week for this repository</div>
+                  <div class="panel-heading">Choose which status checks must pass before branches can be merged into <b>@branch</b>.</div>
                   <div class="panel-body">
                     @knownContexts.map { context =>
                       <div class="checkbox">
@@ -54,9 +50,18 @@
                     }
                   </div>
                 </div>
+
+                <div class="checkbox">
+                  <label>
+                    <input type="checkbox" name="enforce_for_admins" onclick="update()" @check(protection.status.enforcement_level.name=="everyone")>
+                    <span class="strong">Include administrators</span>
+                  </label>
+                  <p class="help-block">Enforce required status checks for repository administrators.</p>
+                </div>
               </div>
+              }
             </div>
-            <input class="btn btn-success" type="submit" value="Save changes" />
+            <input class="btn btn-success js-submit-btn" type="submit" value="Save changes" />
           </div>
         </div>
       </form>
@@ -94,6 +99,7 @@ function getValue(){
 function updateView(protection){
   $('.js-enabled').toggle(protection.enabled);
   $('.js-has_required_statuses').toggle(protection.required_status_checks.enforcement_level != 'off');
+  $('.js-submit-btn').attr('disabled',protection.required_status_checks.enforcement_level != 'off' && protection.required_status_checks.contexts.length == 0);
 }
 function update(){
   var protection = getValue();