modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
| 17 ++++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
| 3 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
| 7 ++++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 3 +
4 files changed, 22 insertions(+), 8 deletions(-)
New commits:
commit 25cfc0c27b8a0224dd628acde62722e92915e707
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Apr 4 12:17:46 2011 -0400
on new op schedule page, select mode=calendar and run=now by default and change title
of Save button to "Schedule"; fix bug where read-only prop values were displayed
as " "
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index 69a3c52..b7f1adf 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -120,6 +120,7 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
@@ -1261,10 +1262,7 @@ public class ConfigurationEditor extends LocatableVLayout {
// TODO (ips, 03/25/11): We eventually want to use StaticTextItems for read-only
PASSWORD props too, but we have
// to wait until we implement masking/unmasking of PASSWORD
props at the SLSB layer first.
if (propertyIsReadOnly && propertyDefinitionSimple.getType() !=
PropertySimpleType.PASSWORD) {
- StaticTextItem staticItem = new StaticTextItem();
- // Property values are user-editable, so escape HTML to prevent an XSS
attack.
- staticItem.setOutputAsHTML(true);
- valueItem = staticItem;
+ valueItem = new StaticTextItem();
} else {
List<PropertyDefinitionEnumeration> enumeratedValues =
propertyDefinitionSimple.getEnumeratedValues();
if (enumeratedValues != null && !enumeratedValues.isEmpty()) {
@@ -1336,13 +1334,20 @@ public class ConfigurationEditor extends LocatableVLayout {
}
}
- // for more robust and repeatable item locators (not positional) assign a name
and title
+ // For more robust and repeatable item locators (not positional), assign a name
and a title.
valueItem.setName(propertySimple.getName());
valueItem.setTitle("none");
valueItem.setShowTitle(false);
+
+ String value = propertySimple.getStringValue();
+ if (valueItem instanceof StaticTextItem) {
+ // Property values are user-editable, so escape HTML when displayed as static
text, to prevent XSS attacks.
+ value = StringUtility.escapeHtml(value);
+ }
// TODO (ips): I don't think we want to use setDefaultValue(), as it will
cause the input to be reset to the
// value if the user clears it.
- valueItem.setDefaultValue(propertySimple.getStringValue());
+ valueItem.setDefaultValue(value);
+
valueItem.setRequired(propertyDefinitionSimple.isRequired());
valueItem.setWidth(220);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
index 13ebe7d..47f9014 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
@@ -190,12 +190,12 @@ public class JobTriggerEditor extends LocatableVLayout {
modeItem.setValueMap(modeValueMap);
modeItem.setVertical(false);
modeItem.setShowTitle(true);
+ modeItem.setValue("calendar");
this.modeForm.setFields(modeItem);
addMember(this.modeForm);
this.calendarModeLayout = new
LocatableVLayout(extendLocatorId("CalendarModeLayout"));
- this.calendarModeLayout.setVisible(false);
this.calendarTypeForm = new
EnhancedDynamicForm(extendLocatorId("CalendarTypeForm"), this.isReadOnly);
@@ -209,6 +209,7 @@ public class JobTriggerEditor extends LocatableVLayout {
calendarTypeValueMap.put("laterAndRepeat",
MSG.widget_jobTriggerEditor_value_laterAndRepeat());
calendarTypeItem.setValueMap(calendarTypeValueMap);
calendarTypeItem.setVertical(false);
+ calendarTypeItem.setValue("now");
this.calendarTypeForm.setFields(calendarTypeItem);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
index 387c4d5..118cec2 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
@@ -218,6 +218,13 @@ public abstract class AbstractOperationScheduleDetailsView extends
AbstractRecor
}
@Override
+ protected ButtonBar buildButtonBar() {
+ ButtonBar buttonBar = super.buildButtonBar();
+ buttonBar.getSaveButton().setTitle(MSG.common_button_schedule());
+ return buttonBar;
+ }
+
+ @Override
protected String getTitleFieldName() {
return ResourceOperationScheduleDataSource.Field.OPERATION_DISPLAY_NAME;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 0e5dadc..4a9cfa4 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -13,7 +13,7 @@ common_buildInfo_gwtVersion = ${gwt.version}
# Button Labels
#--------------
-common_button_ack = Acknowlege
+common_button_ack = Acknowledge
common_button_ack_all = Acknowledge All
common_button_add = Add
common_button_advanced = Advanced...
@@ -37,6 +37,7 @@ common_button_purgeAll = Purge All
common_button_refresh = Refresh
common_button_reset = Reset
common_button_save = Save
+common_button_schedule = Schedule
common_button_search = Search
common_button_set = Set
common_button_showDetails = Show Details...
Show replies by date