diff options
| author | Edwin Kempin <edwin.kempin@sap.com> | 2011-04-08 14:38:03 +0200 |
|---|---|---|
| committer | Edwin Kempin <edwin.kempin@sap.com> | 2011-04-08 14:53:36 +0200 |
| commit | 35dfe247bdcb0b9b83626fadae27bc93ef6fb8f1 (patch) | |
| tree | 7fe36511e9378c13651058aaf3e8b8d3b7f4fdbf | |
| parent | 745ed373a366e3e73dbfda3e9fbbc7a4c363bfc7 (diff) | |
Always disable content merge option if user can't change project
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>
| -rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java index 22fd8d9935..fb35855c6f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java @@ -153,7 +153,7 @@ public class ProjectInfoScreen extends ProjectScreen { useContentMerge.setEnabled(false); useContentMerge.setValue(false); } else { - useContentMerge.setEnabled(true); + useContentMerge.setEnabled(submitType.isEnabled()); } } |