summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-05-10 08:28:22 (EDT)
committer Manik Kishore2012-06-19 07:29:25 (EDT)
commit735289eb9afda951bb5bc6de009f200563a756c4 (patch)
tree7cd410f427e8ce244406fcc9ab48cfecf8106bf3
parentb32e4772d00673088e45a393ffda09638f9db153 (diff)
downloadorg.eclipse.stardust.ui.web-735289eb9afda951bb5bc6de009f200563a756c4.zip
org.eclipse.stardust.ui.web-735289eb9afda951bb5bc6de009f200563a756c4.tar.gz
org.eclipse.stardust.ui.web-735289eb9afda951bb5bc6de009f200563a756c4.tar.bz2
Jira-ID: CRNT-23229
-Added AutomationId's for Preference Manager View. -initialized the preferenceBean in openModifyPrefDialog() in CreateOrModifyPreferenceBean.java and selectedPrefMngrObj in PreferenceManagerBean.java removePreference() methods. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@56214 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/CreateOrModifyPreferenceBean.java1
-rw-r--r--admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceManagerBean.java1
-rw-r--r--admin-portal/src/main/resources/META-INF/xhtml/views/createOrModifyPreference.xhtml24
-rw-r--r--admin-portal/src/main/resources/META-INF/xhtml/views/preferenceManagerView.xhtml12
4 files changed, 34 insertions, 4 deletions
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/CreateOrModifyPreferenceBean.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/CreateOrModifyPreferenceBean.java
index 690abee..0d95005 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/CreateOrModifyPreferenceBean.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/CreateOrModifyPreferenceBean.java
@@ -65,6 +65,7 @@ public class CreateOrModifyPreferenceBean extends PopupUIComponentBean
{
UIComponent source = ae.getComponent();
userValidationMsg = null;
+ preferenceBean = null;
Object obj = source.getAttributes().get("editRow");
// If Edit preference is selected , get selected row
if (null != obj)
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceManagerBean.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceManagerBean.java
index 11ed238..66b2c22 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceManagerBean.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceManagerBean.java
@@ -246,6 +246,7 @@ public class PreferenceManagerBean extends UIComponentBean implements ViewEventH
*/
public void removePreference(ActionEvent event)
{
+ selectedPrefMngrObj = null;
for (Iterator<PreferenceManagerTableEntry> it = prefManagerTable.getList().iterator(); it.hasNext();)
{
PreferenceManagerTableEntry row = it.next();
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/createOrModifyPreference.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/createOrModifyPreference.xhtml
index 2f51f4b..b01fedd 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/createOrModifyPreference.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/createOrModifyPreference.xhtml
@@ -18,7 +18,11 @@
styleClass="headerText" />
<ice:commandButton title="#{common_msgPropsBean['common.close']}"
action="#{createOrModifyPreference.closePopup}" immediate="true"
- styleClass="windowClose" />
+ styleClass="windowClose">
+ <pc:automationTag
+ value="auto-ADM-PrefMngrView-PrefMngrPopup-CloseLink"
+ standAlone="false" />
+ </ice:commandButton>
</ice:panelGroup>
</f:facet>
@@ -39,6 +43,9 @@
<ice:inputText id="moduleId"
value="#{createOrModifyPreference.preferenceBean.moduleId}" required="true"
style="width:215px;" partialSubmit="true">
+ <pc:automationTag
+ value="auto-ADM-PrefMngrView-PrefMngrPopup-ModuleIdTxt"
+ standAlone="false" />
</ice:inputText>
<ice:panelGroup styleClass="msgError">
<ice:message for="moduleId" />
@@ -54,6 +61,9 @@
<ice:inputText id="preferenceId"
value="#{createOrModifyPreference.preferenceBean.preferenceId}"
required="true" style="width:215px;" partialSubmit="true">
+ <pc:automationTag
+ value="auto-ADM-PrefMngrView-PrefMngrPopup-PreferenceIdTxt"
+ standAlone="false" />
</ice:inputText>
<ice:panelGroup styleClass="msgError">
<ice:message for="preferenceId" />
@@ -69,6 +79,9 @@
<ice:inputText id="preferenceName"
value="#{createOrModifyPreference.preferenceBean.preferenceName}"
required="true" style="width:215px;" partialSubmit="true">
+ <pc:automationTag
+ value="auto-ADM-PrefMngrView-PrefMngrPopup-PreferenceNameTxt"
+ standAlone="false" />
</ice:inputText>
<ice:panelGroup styleClass="msgError">
<ice:message for="preferenceName" />
@@ -82,6 +95,9 @@
<ice:inputTextarea id="preferenceValue"
value="#{createOrModifyPreference.preferenceBean.preferenceValue}"
required="true" cols="36" rows="5" partialSubmit="true">
+ <pc:automationTag
+ value="auto-ADM-PrefMngrView-PrefMngrPopup-PreferenceValTxt"
+ standAlone="false" />
</ice:inputTextarea>
@@ -96,11 +112,14 @@
<ice:selectOneRadio
value="#{createOrModifyPreference.selectedView}"
style="text-align: left;" partialSubmit="true"
- layout="pageDirection" styleClass="label-form">
+ layout="pageDirection">
<f:selectItem
value="#{createOrModifyPreference.viewSelection[0]}" />
<f:selectItem
value="#{createOrModifyPreference.viewSelection[1]}" />
+ <pc:automationTag
+ value="auto-ADM-PrefMngrView-PrefMngrPopup-SelView"
+ standAlone="false" requiredValue="label-form"/>
</ice:selectOneRadio>
<ice:panelGroup
@@ -124,6 +143,7 @@
<f:facet name="south">
<ice:panelGroup>
+ <pc:automationTag value="auto-ADM-PrefMngrView-PrefMngrPopup-BtnsBar" standAlone="false" />
<ice:commandButton value="#{messages_admin['common.ok']}"
action="#{createOrModifyPreference.apply}" styleClass="button"
title="#{messages_admin['common.ok']}" immediate="true" />
diff --git a/admin-portal/src/main/resources/META-INF/xhtml/views/preferenceManagerView.xhtml b/admin-portal/src/main/resources/META-INF/xhtml/views/preferenceManagerView.xhtml
index 39bf0d0..b6c1430 100644
--- a/admin-portal/src/main/resources/META-INF/xhtml/views/preferenceManagerView.xhtml
+++ b/admin-portal/src/main/resources/META-INF/xhtml/views/preferenceManagerView.xhtml
@@ -20,9 +20,11 @@
<ice:selectOneRadio value="#{prefManagerBean.selectedView}"
style="text-align: left;"
valueChangeListener="#{prefManagerBean.viewSelectionListener}"
- partialSubmit="true" layout="pageDirection" styleClass="label-form">
+ partialSubmit="true" layout="pageDirection" >
<f:selectItem value="#{prefManagerBean.viewSelection[0]}" />
<f:selectItem value="#{prefManagerBean.viewSelection[1]}" />
+ <pc:automationTag value="auto-ADM-PrefMngrView-SelView"
+ standAlone="false" requiredValue="label-form"/>
</ice:selectOneRadio>
<ice:panelGroup
@@ -40,14 +42,20 @@
<ice:inputText value="#{prefManagerBean.prefSearchTxt}"
style="width: 305px;margin-left:10px;margin-right:10px;"
partialSubmit="true">
+ <pc:automationTag value="auto-ADM-PrefMngrView-PrefSearchTxt"
+ standAlone="false" />
</ice:inputText>
<ice:commandButton
value="#{prefManagerBean.messages['searchPrefStore.label']}"
- action="#{prefManagerBean.performSearch}" styleClass="button" />
+ action="#{prefManagerBean.performSearch}">
+ <pc:automationTag value="auto-ADM-PrefMngrView-SearchPrefBtn"
+ standAlone="false" requiredValue="button"/>
+ </ice:commandButton>
</ice:panelGroup>
<ice:panelGroup styleClass="clearing" />
<ice:panelGroup style="margin-left:5px;">
+ <pc:automationTag value="auto-ADM-PrefMngrView-DataTable"/>
<pc:genericDataTable title="" bean="#{prefManagerBean}"
id="prefManagerList" table="#{prefManagerBean.prefManagerTable}"
sortSupported="true"