From d7c6140fe1f876bd183506e5e84a03751b894e64 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Tue, 23 Oct 2012 09:31:36 +0200 Subject: [PATCH] Show status for enabled plugins in the WebUI as 'Enabled' At the moment no status is shown for enabled plugins on the PluginListScreen. Some users may be confused by the missing status information. Show the status for enabled plugins as 'Enabled'. This is also consistent with the status that is shown for enabled plugins by the 'gerrit plugin ls' SSH command. Change-Id: I369393ef902834d272cbf17ea36dbe83f809d3aa Signed-off-by: Edwin Kempin --- .../java/com/google/gerrit/client/admin/AdminConstants.java | 1 + .../com/google/gerrit/client/admin/AdminConstants.properties | 1 + .../com/google/gerrit/client/admin/PluginListScreen.java | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java index 3966e93cc5..bec768983d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java @@ -109,6 +109,7 @@ public interface AdminConstants extends Constants { String projectAdminTabAccess(); String plugins(); + String pluginEnabled(); String pluginDisabled(); String columnPluginName(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties index 6737c58507..0428c40785 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties @@ -89,6 +89,7 @@ projectAdminTabBranches = Branches projectAdminTabAccess = Access plugins = Plugins +pluginEnabled = Enabled pluginDisabled = Disabled columnPluginName = Plugin Name columnPluginVersion = Version diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java index 3948b3522e..068d12a882 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java @@ -92,9 +92,8 @@ public class PluginListScreen extends PluginScreen { + plugin.name() + "/"))); } table.setText(row, 2, plugin.version()); - if (plugin.isDisabled()) { - table.setText(row, 3, Util.C.pluginDisabled()); - } + table.setText(row, 3, plugin.isDisabled() ? Util.C.pluginDisabled() + : Util.C.pluginEnabled()); final FlexCellFormatter fmt = table.getFlexCellFormatter(); fmt.addStyleName(row, 1, Gerrit.RESOURCES.css().dataCell());