Merge "Display the effective max object size limit on ProjectInfoScreen"

gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
index 38b61eae..2fef7ee 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
@@ -147,6 +147,7 @@
   String link();
   String linkMenuBar();
   String linkMenuItemNotLast();
+  String maxObjectSizeLimitPanel();
   String menuBarUserName();
   String menuBarUserNameAvatar();
   String menuBarUserNameFocusPanel();

gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.java
index d0c52c6..6b1269d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.java
@@ -25,4 +25,7 @@
 
   String deletedReference(String name);
   String deletedSection(String name);
+
+  String effectiveMaxObjectSizeLimit(String effectiveMaxObjectSizeLimit);
+  String globalMaxObjectSizeLimit(String globalMaxObjectSizeLimit);
 }

gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties
index 28f3fcc..cb3784f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties
@@ -5,3 +5,5 @@
 deletedGroup = Deleted Group {0}
 deletedReference = Reference {0} was deleted
 deletedSection = Section {0} was deleted
+effectiveMaxObjectSizeLimit = effective: {0}
+globalMaxObjectSizeLimit = The global max object size limit is set to {0}. The limit cannot be increased on project level.

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

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 d821a96..cd59078 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
@@ -36,6 +36,8 @@
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
@@ -54,6 +56,7 @@
   private ListBox state;
   private ListBox contentMerge;
   private NpTextBox maxObjectSizeLimit;
+  private Label effectiveMaxObjectSizeLimit;
 
   // Section: Contributor Agreements
   private ListBox contributorAgreements;
@@ -185,7 +188,12 @@
 
     maxObjectSizeLimit = new NpTextBox();
     saveEnabler.listenTo(maxObjectSizeLimit);
-    grid.addHtml(Util.C.headingMaxObjectSizeLimit(), maxObjectSizeLimit);
+    effectiveMaxObjectSizeLimit = new Label();
+    HorizontalPanel p = new HorizontalPanel();
+    p.setStyleName(Gerrit.RESOURCES.css().maxObjectSizeLimitPanel());
+    p.add(maxObjectSizeLimit);
+    p.add(effectiveMaxObjectSizeLimit);
+    grid.addHtml(Util.C.headingMaxObjectSizeLimit(), p);
   }
 
   private static ListBox newInheritedBooleanBox() {
@@ -302,6 +310,15 @@
     setSubmitType(result.submit_type());
     setState(result.state());
     maxObjectSizeLimit.setText(result.max_object_size_limit().configured_value());
+    if (result.max_object_size_limit().inherited_value() != null) {
+      effectiveMaxObjectSizeLimit.setVisible(true);
+      effectiveMaxObjectSizeLimit.setText(
+          Util.M.effectiveMaxObjectSizeLimit(result.max_object_size_limit().value()));
+      effectiveMaxObjectSizeLimit.setTitle(
+          Util.M.globalMaxObjectSizeLimit(result.max_object_size_limit().inherited_value()));
+    } else {
+      effectiveMaxObjectSizeLimit.setVisible(false);
+    }
 
     saveProject.setEnabled(false);
   }

gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
index 7196b87..8087b68 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
@@ -1543,3 +1543,8 @@
 .projectNameColumn {
   min-width: 300px;
 }
+
+/** ProjectSettings */
+.maxObjectSizeLimitPanel td {
+  padding-right: 5px;
+}