java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java | 26
++++++++++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 ++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 24
+++++++++
java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 19
++++++-
4 files changed, 72 insertions(+), 3 deletions(-)
New commits:
commit 892dbe8f0819537d37586fed0f5fcba45c94aa8c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Feb 28 14:18:21 2013 +0100
abrt: webui to set crashfile upload size
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
index 8453667..78cbd9d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
@@ -14,10 +14,14 @@
*/
package com.redhat.rhn.frontend.action.multiorg;
+import com.redhat.rhn.common.validator.ValidatorError;
import
com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.frontend.struts.RhnValidationHelper;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -45,6 +49,28 @@ public class OrgConfigAction extends RhnAction {
if (ctx.isSubmitted()) {
org.setStagingContentEnabled(request.
getParameter("staging_content_enabled") != null);
+
+ Long newLimit = null;
+ try {
+ newLimit = Long.parseLong(
+
request.getParameter("crashfile_sizelimit").trim());
+
+ if (newLimit < 0) {
+ throw new IllegalArgumentException();
+ }
+ }
+ catch (IllegalArgumentException ex) {
+ ValidatorError error = new
ValidatorError("orgsizelimit.invalid");
+ getStrutsDelegate().saveMessages(request,
+ RhnValidationHelper.validatorErrorToActionErrors(error));
+
+ return
getStrutsDelegate().forwardParam(mapping.findForward("error"),
+ RequestContext.ORG_ID, org.getId().toString());
+ }
+ if
(StringUtils.isNotEmpty(request.getParameter("crashfile_sizelimit"))) {
+ org.setCrashFileSizelimit(newLimit);
+ }
+
ActionMessages msg = new ActionMessages();
msg.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("message.org_name_updated",
org.getName()));
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index e2153ee..d4f0a16 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -6684,6 +6684,12 @@ Follow this url to see the full list of inactive systems:
<context
context-type="sourcefile">/rhn/systems/details/SystemChannels.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="orgsizelimit.invalid">
+ <source>Size limit modification must be a valid non negative
number.</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="orgsystemsubs.invalid">
<source>Entitlement modification must be a valid number for
{0}.</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 5f2c1c7..93abeb8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -3255,6 +3255,18 @@ button below, and <b>will be unable to log back
in</b>.</source>
<context
context-type="sourcefile">/rhn/admin/multiorg/OrgDetails.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="orgconfig.jsp.header">
+ <source>Organization Configuration</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="orgconfig.jsp.description">
+ <source>Below you configure your organization to use staging content and
set up the upload size limit for a crash file. The upload limit is a non negative number.
Zero means no limit.</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="org.name.jsp">
<source>Organization Name</source>
<context-group name="ctx">
@@ -3285,6 +3297,18 @@ button below, and <b>will be unable to log back
in</b>.</source>
<context
context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="org-config.crashfile-sizelimit.jsp">
+ <source>Crash File Upload Size Limit</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="org-config.sizelimit-hint.jsp">
+ <source>Enter the limit size in bytes. Zero means no limit.</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/admin/multiorg/OrgConfigDetails.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="org.id.jsp">
<source>Organization ID</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
index d2a588f..5603cd8 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
@@ -41,8 +41,9 @@
<rhn:csrf />
<rhn:submitted/>
<input type="hidden" name="oid"
value="${param.oid}"/>
- <h2><bean:message key="orgdetails.jsp.header"/></h2>
-
+ <h2><bean:message key="orgconfig.jsp.header"/></h2>
+ <bean:message key="orgconfig.jsp.description"/>
+ <p/>
<table class="details" align="center">
<tr>
<th><label for="staging_content_enabled"><bean:message
key="org-config.staging-content.jsp"/></th>
@@ -54,16 +55,28 @@
/>
</td>
</tr>
+ <tr>
+ <th>
+ <bean:message key="org-config.crashfile-sizelimit.jsp"/>
+ </th>
+ <td>
+ <input type="number"
+ name="crashfile_sizelimit"
+ value="${org.crashFileSizelimit}"
+ id="crashfile_sizelimit" />
+ <td>
+ </tr>
</table>
<div align="right">
<hr/>
+
<html:submit>
<bean:message key="orgdetails.jsp.submit"/>
</html:submit>
+
</div>
</form>
-
</body>
</html:html>