java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java | 26
++++++++--
java/code/webapp/WEB-INF/struts-config.xml | 1
2 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit cccc19a838585784dbd030a0c6c776ffa9d4492d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 4 10:43:00 2011 +0200
sort inputs on the page
they are sometimes displayed in different order, which is confusing
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
index f087a48..61da710 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
@@ -34,6 +34,8 @@ import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
import java.net.IDN;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -102,6 +104,15 @@ public class MonitoringConfigAction extends BaseConfigAction {
value));
}
+ // sort inputs in form using Description
+ Collections.sort(nameDescVals, new Comparator() {
+ public int compare(Object x, Object y) {
+ String xName = ((NameDescriptionValue)x).getName();
+ String yName = ((NameDescriptionValue)y).getName();
+ return xName.compareTo(yName);
+ }
+ }
+ );
if (isSubmitted(form)) {
ConfigureSatelliteCommand csc = (ConfigureSatelliteCommand)
getCommand(user);
commit 3e738c0ce75fe4e4e21cf8959d775cfef4648603
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 4 10:37:48 2011 +0200
683200 - encode hostname to IDN in MonitoringConfig.do page
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
index fe596e7..f087a48 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
@@ -33,6 +33,7 @@ import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
+import java.net.IDN;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -53,6 +54,7 @@ public class MonitoringConfigAction extends BaseConfigAction {
private static Logger logger = Logger.getLogger(MonitoringConfigAction.class);
public static final String IS_MONITORING_SCOUT = "is_monitoring_scout";
+ public static final String MDOM = "MDOM";
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping, ActionForm formIn,
@@ -90,9 +92,14 @@ public class MonitoringConfigAction extends BaseConfigAction {
logger.debug("execute() - Name: " + ci.getName() +
" value: " + ci.getDefinition());
}
- nameDescVals.add(new NameDescriptionValue(ci.getName(),
- LocalizationService.getInstance().getMessage(ci.getName()),
- ci.getDefinition()));
+ String value = ci.getDefinition();
+ String name = ci.getName();
+ if (MDOM.equals(name)) {
+ value = IDN.toUnicode(value);
+ }
+ nameDescVals.add(new NameDescriptionValue(name,
+ LocalizationService.getInstance().getMessage(name),
+ value));
}
@@ -100,6 +107,7 @@ public class MonitoringConfigAction extends BaseConfigAction {
ConfigureSatelliteCommand csc = (ConfigureSatelliteCommand)
getCommand(user);
csc.updateBoolean(ConfigDefaults.WEB_IS_MONITORING_SCOUT,
(Boolean) form.get(IS_MONITORING_SCOUT));
+ csc.updateString(MDOM, IDN.toASCII(form.getString(MDOM)));
if (csc.getKeysToBeUpdated().size() > 0) {
valuesChanged = true;
ValidatorError[] verrors = csc.storeConfiguration();
@@ -124,6 +132,7 @@ public class MonitoringConfigAction extends BaseConfigAction {
form.set(IS_MONITORING_SCOUT,
new Boolean(Config.get().getBoolean(
ConfigDefaults.WEB_IS_MONITORING_SCOUT)));
+ // form.set(MDOM, IDN.toUnicode((String) form.get(MDOM)));
}
req.setAttribute("configList", nameDescVals);
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index 7a841a7..3d43fe0 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -396,6 +396,7 @@
<form-property name="squelch"
type="java.lang.String"/>
<form-property name="is_monitoring_scout"
type="java.lang.Boolean"/>
<form-property name="submitted"
type="java.lang.Boolean"/>
+ <form-property name="MDOM"
type="java.lang.String"/>
</form-bean>
<form-bean name="scheduleRemoteCmdForm"
Show replies by date