opendev/gerrit
Code Issues Proposed changes

Always disable content merge option if user can't change project

Browse Source 
If a user can't modify the options of a project the corresponding
UI controls in the project info screen are disabled. However there is
a special handling to enable the option 'Automatically resolve
conflicts' if the submit type is not 'Fast Forward Only'. This logic
was enabling the 'Automatically resolve conflicts' option even if the
user is not allowed to change it. This change fixes this issue.

Change-Id: Iaeab804ce172917ceff3c4fb3d5c503f5f306822
Signed-off-by: Edwin Kempin <edwin.kempin@gmail.com>
This commit is contained in:
Edwin Kempin
2011-04-08 14:38:03 +02:00
parent 745ed373a3
commit 35dfe247bd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,7 @@ public class ProjectInfoScreen extends ProjectScreen {
useContentMerge.setEnabled(false);
useContentMerge.setValue(false);
} else {
useContentMerge.setEnabled(true);
useContentMerge.setEnabled(submitType.isEnabled());
}
}