Skip to content

Commit a3b37a3

Browse files
committed
Fix enabling/disabling for build setting fields
1 parent 2aaebe3 commit a3b37a3

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

src/main/twirl/gitbucket/ci/config.scala.html

+15-16
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,22 @@
3737
<input id="buildFile" name="buildFile" class="form-control" value="@config.filter(_.buildType == "file").map(_.buildScript)">
3838
<span id="error-buildFile" class="error"></span>
3939
@if(systemConfig.enableDocker) {
40-
<label>
41-
<input type="radio" name="buildType" value="docker" @if(config.exists(_.buildType == "docker")){checked}>
42-
Build in docker
43-
<span class="normal muted">(Specify a Dockerfile in your repository to build this project)</span>
44-
</label>
45-
<input id="dockerfile" name="dockerfile" class="form-control" value="@config.filter(_.buildType == "docker").map(_.buildScript)">
46-
<span id="error-dockerfile" class="error"></span>
40+
<label>
41+
<input type="radio" name="buildType" value="docker" @if(config.exists(_.buildType == "docker")){checked}>
42+
Build in docker
43+
<span class="normal muted">(Specify a Dockerfile in your repository to build this project)</span>
44+
</label>
45+
<input id="dockerfile" name="dockerfile" class="form-control" value="@config.filter(_.buildType == "docker").map(_.buildScript)">
46+
<span id="error-dockerfile" class="error"></span>
4747
}
4848
@if(systemConfig.enableDockerCompose){
49-
<label>
50-
<input type="radio" name="buildType" value="docker-compose" @if(config.exists(_.buildType == "docker-compose")){checked}>
51-
Build in docker compose
52-
<span class="normal muted">(Specify a docker-compose.yml in your repository to build this project)</span>
53-
</label>
54-
<input id="composeFile" name="composeFile" class="form-control" value="@config.filter(_.buildType == "docker-compose").map(_.buildScript)">
55-
<span id="error-composeFile" class="error"></span>
49+
<label>
50+
<input type="radio" name="buildType" value="docker-compose" @if(config.exists(_.buildType == "docker-compose")){checked}>
51+
Build in docker compose
52+
<span class="normal muted">(Specify a docker-compose.yml in your repository to build this project)</span>
53+
</label>
54+
<input id="composeFile" name="composeFile" class="form-control" value="@config.filter(_.buildType == "docker-compose").map(_.buildScript)">
55+
<span id="error-composeFile" class="error"></span>
5656
}
5757
</fieldset>
5858
<fieldset class="form-group">
@@ -91,12 +91,11 @@
9191
});
9292

9393
function updateStatus(){
94-
console.log($('#enableBuild').prop('checked'));
9594
if($('#enableBuild').prop('checked')){
9695
// Enables radio buttons
9796
$('#buildSettings input[type=radio]').prop('disabled', false);
9897
// Once disables both fields
99-
$('textarea[name=buildScript], input[name=buildFile]').prop('disabled', true);
98+
$('textarea[name=buildScript], input[name=buildFile], input[name=dockerfile], input[name=composeFile]').prop('disabled', true);
10099
// Enables a field if corresponding radio button has been checked
101100
var buildType = $('input[name=buildType]:checked').val();
102101
if(buildType == 'script'){

0 commit comments

Comments
 (0)