Skip to content

Commit 7ad6320

Browse files
Robert FührichtRobert Führicht
authored andcommitted
make requireScore dependant on requireApproval
1 parent 745f87d commit 7ad6320

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/main/java/com/gitblit/client/EditRepositoryDialog.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ private void initialize(int protocolVersion, RepositoryModel anRepository) {
228228
Integer [] scores = { 0, 2, 4, 5, 6, 8 };
229229
requireScore = new JComboBox(scores);
230230
requireScore.setSelectedItem(anRepository.requireScore);
231+
requireScore.setEnabled(anRepository.requireApproval);
231232

232233
writeSignoffCommit = new JCheckBox(Translation.get("gb.writeSignoffDescription"),
233234
anRepository.writeSignoffCommit);

src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,12 +454,13 @@ protected void onSubmit() {
454454
getString("gb.requireApprovalDescription"),
455455
new PropertyModel<Boolean>(repositoryModel, "requireApproval")));
456456
List<Integer> scores = Arrays.asList(-1, 0, 2, 4, 5, 6, 8);
457+
final boolean allowRequireScore = repositoryModel.requireApproval;
457458
form.add(new ChoiceOption<Integer>("requireScore",
458459
getString("gb.requireScore"),
459460
getString("gb.requireScoreDescription"),
460461
new DropDownChoice<Integer>("choice",
461462
new PropertyModel<Integer>(repositoryModel, "requireScore"),
462-
scores)));
463+
scores)).setEnabled(allowRequireScore));
463464
form.add(new BooleanOption("writeSignoffCommit",
464465
getString("gb.writeSignoffCommit"),
465466
getString("gb.writeSignoffCommitDescription"),

0 commit comments

Comments
 (0)