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

Fix #328

Browse Source
This commit is contained in:
takezoe
2014-03-31 00:39:30 +09:00
parent 84ac2974fb
commit 5d3365a944
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/app/RepositorySettingsController.scala
View File

@@ -72,7 +72,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
repository.owner, repository.owner,
repository.name, repository.name,
form.description, form.description,
form.defaultBranch, if(repository.branchList.isEmpty) "master" else form.defaultBranch,
repository.repository.parentUserName.map { _ => repository.repository.parentUserName.map { _ =>
repository.repository.isPrivate repository.repository.isPrivate
} getOrElse form.isPrivate } getOrElse form.isPrivate

11
src/main/twirl/settings/options.scala.html
View File

@@ -20,11 +20,18 @@
</fieldset> </fieldset>
<fieldset class="margin"> <fieldset class="margin">
<label for="defaultBranch" class="strong">Default Branch:</label> <label for="defaultBranch" class="strong">Default Branch:</label>
<select name="defaultBranch" id="defaultBranch"> <select name="defaultBranch" id="defaultBranch"@if(repository.branchList.isEmpty){ disabled}>
@if(repository.branchList.isEmpty){
<option value="none" selected>No Branch</option>
} else {
@repository.branchList.map { branch => @repository.branchList.map { branch =>
<option value="@branch"@if(branch==repository.repository.defaultBranch){ selected}>@branch</option> <option@if(branch==repository.repository.defaultBranch){ selected}>@branch</option>
}
} }
</select> </select>
@if(repository.branchList.isEmpty){
<input type="hidden" name="defaultBranch" value="none"/>
}
<span class="error" id="error-defaultBranch"></span> <span class="error" id="error-defaultBranch"></span>
</fieldset> </fieldset>
<fieldset class="margin"> <fieldset class="margin">