opendev/gerrit
Code Issues Proposed changes

ProjectInfoScreen: Disable content merge option if fast forward only

Browse Source 
If 'Fast Forward Only' is selected as submit type the 'Automatically
resolve conflicts' is disabled because the content merge option is
not relevant for 'Fast Forward Only'.

However if the page was loaded and 'Fast Forward Only' was selected as
submit type the 'Automatically resolve conflicts' was wrongly enabled.

Change-Id: I95722dd9ed1831b102e4a017c0fb9ded655e300f
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin 2014-07-03 14:01:41 +02:00 committed by Edwin Kempin
parent ee06a49d7d
commit 2ce281f0c5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java
View File

@ -154,9 +154,9 @@ public class ProjectInfoScreen extends ProjectScreen {
}
private void enableForm(boolean isOwner) {
submitType.setEnabled(isOwner);
state.setEnabled(isOwner);
contentMerge.setEnabled(isOwner);
submitType.setEnabled(isOwner);
setEnabledForUseContentMerge();
descTxt.setEnabled(isOwner);
contributorAgreements.setEnabled(isOwner);
signedOffBy.setEnabled(isOwner);