summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-05-08 09:46:49 (EDT)
committerManik Kishore2012-06-19 07:28:57 (EDT)
commitf68034c4ee636b1bbb59ef69e158694e5197736c (patch)
treec2dfdf0b676ecfeca1ecf59d10e31d34da9bb628
parent8f34f287d26a9b93f47c4f6056ff9a7deb1286f1 (diff)
downloadorg.eclipse.stardust.ui.web-f68034c4ee636b1bbb59ef69e158694e5197736c.zip
org.eclipse.stardust.ui.web-f68034c4ee636b1bbb59ef69e158694e5197736c.tar.gz
org.eclipse.stardust.ui.web-f68034c4ee636b1bbb59ef69e158694e5197736c.tar.bz2
Jira-ID: CRNT-23229
-Added error handling for Add Preferences -Added I18N messages for preference Manager View. -Made changes to CreateOrModifyPreferenceBean.java apply() method for edit preference. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@56172 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/CreateOrModifyPreferenceBean.java121
-rw-r--r--admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceBean.java34
-rw-r--r--admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceManagerBean.java19
-rw-r--r--admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceManagerTableEntry.java18
-rw-r--r--admin-portal/src/main/resources/META-INF/xhtml/views/createOrModifyPreference.xhtml29
-rw-r--r--admin-portal/src/main/resources/META-INF/xhtml/views/preferenceManagerView.xhtml5
-rw-r--r--admin-portal/src/main/resources/admin-portal-messages.properties1
-rw-r--r--admin-portal/src/main/resources/admin-portal-messages_de.properties20
-rw-r--r--admin-portal/src/main/resources/admin-portal-messages_zh_CN.properties20
9 files changed, 153 insertions, 114 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 04b35bb..d014815 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
@@ -47,6 +47,8 @@ public class CreateOrModifyPreferenceBean extends PopupUIComponentBean
private String selectedView;
private final SelectItem[] viewSelection = new SelectItem[2];
private AdminMessagesPropertiesBean propsBean;
+ private String userValidationMsg;
+ private UserAutocompleteMultiSelector userSelector;
public CreateOrModifyPreferenceBean()
{
@@ -61,6 +63,7 @@ public class CreateOrModifyPreferenceBean extends PopupUIComponentBean
public void openModifyPrefDialog(ActionEvent ae)
{
UIComponent source = ae.getComponent();
+ userValidationMsg = null;
Object obj = source.getAttributes().get("editRow");
// If Edit preference is selected , get selected row
if (null != obj)
@@ -74,8 +77,11 @@ public class CreateOrModifyPreferenceBean extends PopupUIComponentBean
// Initialize the PreferenceBean with current row selected
if (row.isSelected())
{
- this.preferenceBean = new PreferenceBean(row.getScope(), row.getModuleId(), row.getPreferenceId(),
- row.getPreferenceName(), row.getPreferenceValue(), null);
+ this.preferenceBean = new PreferenceBean(row.getModuleId(), row.getPreferenceId(),
+ row.getPreferenceName(), row.getPreferenceValue(), row.getUserId(), row.getRealmId());
+ selectedView = row.getScope().contains(VIEW_TYPE.PARTITION.name())
+ ? VIEW_TYPE.PARTITION.name()
+ : VIEW_TYPE.USER.name();
}
}
if (null == preferenceBean)
@@ -90,13 +96,14 @@ public class CreateOrModifyPreferenceBean extends PopupUIComponentBean
{
this.preferenceBean = new PreferenceBean();
this.modifyMode = false;
+ viewSelection[0] = new SelectItem(VIEW_TYPE.PARTITION.name(),
+ propsBean.getString("views.prefManagerBean.modifyPreference.tenant.label"));
+ viewSelection[1] = new SelectItem(VIEW_TYPE.USER.name(),
+ propsBean.getString("views.prefManagerBean.modifyPreference.user.label"));
+ selectedView = VIEW_TYPE.PARTITION.name();
+ userSelector = new UserAutocompleteMultiSelector(false, true);
+ userSelector.setShowOnlineIndicator(false);
}
-
- viewSelection[0] = new SelectItem(VIEW_TYPE.TENENT.name(),
- propsBean.getString("views.prefManagerBean.modifyPreference.tenant.label"));
- viewSelection[1] = new SelectItem(VIEW_TYPE.USER.name(),
- propsBean.getString("views.prefManagerBean.modifyPreference.user.label"));
- selectedView = VIEW_TYPE.TENENT.name();
super.openPopup();
}
@@ -106,37 +113,52 @@ public class CreateOrModifyPreferenceBean extends PopupUIComponentBean
.getAdministrationService();
Map<String, Serializable> preferenceMap = new HashMap<String, Serializable>();
Preferences prefs = null;
- preferenceMap.put(getPreferenceName(), getPreferenceValue());
- if (VIEW_TYPE.TENENT.name().equals(selectedView))
+ userValidationMsg = null;
+ preferenceMap.put(preferenceBean.getPreferenceName(), preferenceBean.getPreferenceValue());
+ if (VIEW_TYPE.PARTITION.name().equals(selectedView))
{
- if (modifyMode)
+ // If Preference for current Preference Id already exist,set Preference Map
+ prefs = adminService.getPreferences(PreferenceScope.PARTITION, preferenceBean.getModuleId(),
+ preferenceBean.getPreferenceId());
+ if (null != prefs)
{
- prefs = adminService.getPreferences(PreferenceScope.PARTITION, getModuleId(), getPreferenceId());
- prefs.getPreferences().put(getPreferenceName(), getPreferenceValue());
+ prefs.getPreferences().put(preferenceBean.getPreferenceName(), preferenceBean.getPreferenceValue());
}
else
{
- prefs = new Preferences(PreferenceScope.PARTITION, getModuleId(), getPreferenceId(), preferenceMap);
+ prefs = new Preferences(PreferenceScope.PARTITION, preferenceBean.getModuleId(),
+ preferenceBean.getPreferenceId(), preferenceMap);
}
-
}
else
{
- if (modifyMode)
+ prefs = adminService.getPreferences(PreferenceScope.USER, preferenceBean.getModuleId(),
+ preferenceBean.getPreferenceId());
+
+ if (null != prefs)
{
- prefs = adminService.getPreferences(PreferenceScope.USER, getModuleId(), getPreferenceId());
- prefs.getPreferences().put(getPreferenceName(), getPreferenceValue());
+ prefs.getPreferences().put(preferenceBean.getPreferenceName(), preferenceBean.getPreferenceValue());
+ prefs.setUserId(preferenceBean.getUserId());
+ prefs.setRealmId(preferenceBean.getRealmId());
}
else
{
- UserWrapper userWrapper = getUserSelector().getSelectedValue();
- if (userWrapper != null)
- {
- User u = userWrapper.getUser();
- prefs = new Preferences(PreferenceScope.USER, getModuleId(), getPreferenceId(), preferenceMap);
- prefs.setUserId(u.getId());
- prefs.setRealmId(u.getRealm().getId());
- }
+ prefs = new Preferences(PreferenceScope.USER, preferenceBean.getModuleId(),
+ preferenceBean.getPreferenceId(), preferenceMap);
+ }
+ UserWrapper userWrapper = getUserSelector().getSelectedValue();
+ if (!modifyMode && null != userWrapper)
+ {
+ User u = userWrapper.getUser();
+ prefs.setUserId(u.getId());
+ prefs.setRealmId(u.getRealm().getId());
+ }
+ // If Add Preference with User is selected and User entry is empty add error
+ // message
+ else if (!modifyMode && null == userWrapper)
+ {
+ userValidationMsg = propsBean.getString("views.prefManagerBean.modifyPreference.confirmAddPref.error");
+ return;
}
}
adminService.savePreferences(prefs);
@@ -168,49 +190,9 @@ public class CreateOrModifyPreferenceBean extends PopupUIComponentBean
return preferenceBean;
}
- public String getModuleId()
- {
- return preferenceBean.getModuleId();
- }
-
- public void setModuleId(String moduleId)
- {
- preferenceBean.setModuleId(moduleId);
- }
-
- public String getPreferenceId()
- {
- return preferenceBean.getPreferenceId();
- }
-
- public void setPreferenceId(String preferenceId)
- {
- preferenceBean.setPreferenceId(preferenceId);
- }
-
- public String getPreferenceName()
- {
- return preferenceBean.getPreferenceName();
- }
-
- public void setPreferenceName(String preferenceName)
- {
- preferenceBean.setPreferenceName(preferenceName);
- }
-
- public String getPreferenceValue()
- {
- return preferenceBean.getPreferenceValue();
- }
-
- public void setPreferenceValue(String preferenceValue)
- {
- preferenceBean.setPreferenceValue(preferenceValue);
- }
-
public UserAutocompleteMultiSelector getUserSelector()
{
- return preferenceBean.getUserSelector();
+ return userSelector;
}
public SelectItem[] getViewSelection()
@@ -223,4 +205,9 @@ public class CreateOrModifyPreferenceBean extends PopupUIComponentBean
return propsBean;
}
+ public String getUserValidationMsg()
+ {
+ return userValidationMsg;
+ }
+
}
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceBean.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceBean.java
index 3bd394d..f3e8937 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceBean.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceBean.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.stardust.ui.web.admin.views;
-import org.eclipse.stardust.ui.web.viewscommon.user.UserAutocompleteMultiSelector;
/**
*
@@ -20,40 +19,28 @@ import org.eclipse.stardust.ui.web.viewscommon.user.UserAutocompleteMultiSelecto
public class PreferenceBean
{
- private String scope;
private String moduleId;
private String preferenceId;
private String preferenceName;
private String preferenceValue;
- private UserAutocompleteMultiSelector userSelector;
+ private String userId;
+ private String realmId;
public PreferenceBean()
{
super();
- userSelector = new UserAutocompleteMultiSelector(false, true);
- userSelector.setShowOnlineIndicator(false);
}
- public PreferenceBean(String scope, String moduleId, String preferenceId, String preferenceName,
- String preferenceValue, UserAutocompleteMultiSelector userSelector)
+ public PreferenceBean(String moduleId, String preferenceId, String preferenceName, String preferenceValue,
+ String userId, String realmId)
{
super();
- this.scope = scope;
this.moduleId = moduleId;
this.preferenceId = preferenceId;
this.preferenceName = preferenceName;
this.preferenceValue = preferenceValue;
- this.userSelector = userSelector;
- }
-
- public String getScope()
- {
- return scope;
- }
-
- public void setScope(String scope)
- {
- this.scope = scope;
+ this.userId = userId;
+ this.realmId = realmId;
}
public String getModuleId()
@@ -96,9 +83,14 @@ public class PreferenceBean
this.preferenceValue = preferenceValue;
}
- public UserAutocompleteMultiSelector getUserSelector()
+ public String getUserId()
+ {
+ return userId;
+ }
+
+ public String getRealmId()
{
- return userSelector;
+ return realmId;
}
}
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 c7dbf06..fd4d0a7 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
@@ -38,10 +38,10 @@ import org.eclipse.stardust.ui.web.common.column.DefaultColumnModel;
import org.eclipse.stardust.ui.web.common.column.IColumnModel;
import org.eclipse.stardust.ui.web.common.columnSelector.TableColumnSelectorPopup;
import org.eclipse.stardust.ui.web.common.dialogs.ConfirmationDialog;
-import org.eclipse.stardust.ui.web.common.dialogs.ConfirmationDialogHandler;
import org.eclipse.stardust.ui.web.common.dialogs.ConfirmationDialog.DialogActionType;
import org.eclipse.stardust.ui.web.common.dialogs.ConfirmationDialog.DialogContentType;
import org.eclipse.stardust.ui.web.common.dialogs.ConfirmationDialog.DialogStyle;
+import org.eclipse.stardust.ui.web.common.dialogs.ConfirmationDialogHandler;
import org.eclipse.stardust.ui.web.common.event.ViewEvent;
import org.eclipse.stardust.ui.web.common.event.ViewEvent.ViewEventType;
import org.eclipse.stardust.ui.web.common.event.ViewEventHandler;
@@ -104,9 +104,9 @@ public class PreferenceManagerBean extends UIComponentBean implements ViewEventH
{
userSelector = new UserAutocompleteMultiSelector(false, true);
userSelector.setShowOnlineIndicator(false);
- viewSelection[0] = new SelectItem(VIEW_TYPE.TENENT.name(), getMessages().getString("tenant.label"));
+ viewSelection[0] = new SelectItem(VIEW_TYPE.PARTITION.name(), getMessages().getString("tenant.label"));
viewSelection[1] = new SelectItem(VIEW_TYPE.USER.name(), getMessages().getString("user.label"));
- selectedView = VIEW_TYPE.TENENT.name();
+ selectedView = VIEW_TYPE.PARTITION.name();
prefList = CollectionUtils.newArrayList();
createTable();
update();
@@ -134,7 +134,7 @@ public class PreferenceManagerBean extends UIComponentBean implements ViewEventH
List<Preferences> prefs = new ArrayList<Preferences>();
prefList.clear();
String userFullName = null;
- if (VIEW_TYPE.TENENT.name().equals(selectedView))
+ if (VIEW_TYPE.PARTITION.name().equals(selectedView))
{
// fetch all the Partition preferences
prefs = qService.getAllPreferences(PreferenceQuery.findAll(PreferenceScope.PARTITION));
@@ -159,10 +159,9 @@ public class PreferenceManagerBean extends UIComponentBean implements ViewEventH
for (Map.Entry<String, Serializable> entry : pref11.entrySet())
{
- prefList
- .add(new PreferenceManagerTableEntry(pref.getScope().name(), pref.getModuleId(), pref
- .getPreferencesId(), entry.getKey(), entry.getValue().toString(), pref.getPartitionId(),
- userFullName));
+ prefList.add(new PreferenceManagerTableEntry(pref.getScope().name(), pref.getModuleId(), pref
+ .getPreferencesId(), entry.getKey(), entry.getValue().toString(), pref.getUserId(),
+ pref.getRealmId(), pref.getPartitionId(), userFullName));
}
}
@@ -310,7 +309,7 @@ public class PreferenceManagerBean extends UIComponentBean implements ViewEventH
AdministrationService adminService = SessionContext.findSessionContext().getServiceFactory()
.getAdministrationService();
Preferences selPreference = null;
- if (VIEW_TYPE.TENENT.name().equals(selectedView))
+ if (VIEW_TYPE.PARTITION.name().equals(selectedView))
{
selPreference = adminService.getPreferences(PreferenceScope.PARTITION, selectedPrefMngrObj.getModuleId(),
selectedPrefMngrObj.getPreferenceId());
@@ -335,7 +334,7 @@ public class PreferenceManagerBean extends UIComponentBean implements ViewEventH
*
*/
public static enum VIEW_TYPE {
- TENENT, USER;
+ PARTITION, USER;
}
public SelectItem[] getViewSelection()
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceManagerTableEntry.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceManagerTableEntry.java
index 5ef931b..e891bdb 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceManagerTableEntry.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/PreferenceManagerTableEntry.java
@@ -28,10 +28,12 @@ public class PreferenceManagerTableEntry extends DefaultRowModel
private String preferenceId;
private String preferenceName;
private String preferenceValue;
+ private String userId;
+ private String realmId;
private boolean selected;
public PreferenceManagerTableEntry(String scope, String moduleId, String preferenceId, String preferenceName,
- String preferenceValue, String partitionId, String userName)
+ String preferenceValue, String userId, String realmId, String partitionId, String userName)
{
super();
this.scope = scope + getPreferenceScope(partitionId, userName);
@@ -39,6 +41,8 @@ public class PreferenceManagerTableEntry extends DefaultRowModel
this.preferenceId = preferenceId;
this.preferenceName = preferenceName;
this.preferenceValue = preferenceValue;
+ this.userId = userId;
+ this.realmId = realmId;
}
public String getScope()
@@ -76,6 +80,16 @@ public class PreferenceManagerTableEntry extends DefaultRowModel
this.selected = selected;
}
+ public String getUserId()
+ {
+ return userId;
+ }
+
+ public String getRealmId()
+ {
+ return realmId;
+ }
+
/**
* Utility method which returns the User Full Name or Partition Id for preference
*
@@ -87,7 +101,7 @@ public class PreferenceManagerTableEntry extends DefaultRowModel
{
if (null != userName)
{
- return "(" + userName + ")";
+ return " (" + userName + ")";
}
else
{
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 06db746..2f51f4b 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
@@ -37,7 +37,7 @@
<ice:panelGroup
rendered="#{!createOrModifyPreference.modifyMode}">
<ice:inputText id="moduleId"
- value="#{createOrModifyPreference.moduleId}" required="true"
+ value="#{createOrModifyPreference.preferenceBean.moduleId}" required="true"
style="width:215px;" partialSubmit="true">
</ice:inputText>
<ice:panelGroup styleClass="msgError">
@@ -52,7 +52,7 @@
<ice:panelGroup
rendered="#{!createOrModifyPreference.modifyMode}">
<ice:inputText id="preferenceId"
- value="#{createOrModifyPreference.preferenceId}"
+ value="#{createOrModifyPreference.preferenceBean.preferenceId}"
required="true" style="width:215px;" partialSubmit="true">
</ice:inputText>
<ice:panelGroup styleClass="msgError">
@@ -67,7 +67,7 @@
<ice:panelGroup
rendered="#{!createOrModifyPreference.modifyMode}">
<ice:inputText id="preferenceName"
- value="#{createOrModifyPreference.preferenceName}"
+ value="#{createOrModifyPreference.preferenceBean.preferenceName}"
required="true" style="width:215px;" partialSubmit="true">
</ice:inputText>
<ice:panelGroup styleClass="msgError">
@@ -80,8 +80,8 @@
styleClass="label-form" />
<ice:inputTextarea id="preferenceValue"
- value="#{createOrModifyPreference.preferenceValue}"
- required="true" cols="36" partialSubmit="true">
+ value="#{createOrModifyPreference.preferenceBean.preferenceValue}"
+ required="true" cols="36" rows="5" partialSubmit="true">
</ice:inputTextarea>
@@ -104,27 +104,32 @@
</ice:selectOneRadio>
<ice:panelGroup
- style="padding-top: 10px;width:auto;min-width: 150px; " rendered="#{createOrModifyPreference.selectedView eq 'USER'}">
+ style="padding-top: 10px;width:auto;min-width: 150px; "
+ rendered="#{createOrModifyPreference.selectedView eq 'USER'}">
<ui:include
- src="#{createOrModifyPreference.preferenceBean.userSelector.autocompleteContentUrl}">
+ src="#{createOrModifyPreference.userSelector.autocompleteContentUrl}">
<ui:param name="component"
value="#{createOrModifyPreference.userSelector}" />
</ui:include>
</ice:panelGroup>
</ice:panelGrid>
+ <ice:panelGroup></ice:panelGroup>
+ <ice:panelGroup styleClass="msgError" rendered="#{createOrModifyPreference.selectedView eq 'USER'}">
+ <ice:outputText
+ value="#{createOrModifyPreference.userValidationMsg}"
+ styleClass="msgError" escape="false" />
+ </ice:panelGroup>
</ice:panelGrid>
</f:facet>
<f:facet name="south">
<ice:panelGroup>
<ice:commandButton value="#{messages_admin['common.ok']}"
- action="#{createOrModifyPreference.apply}" id="applyPreference"
- styleClass="button" title="#{messages_admin['common.ok']}"
- immediate="true" />
+ action="#{createOrModifyPreference.apply}" styleClass="button"
+ title="#{messages_admin['common.ok']}" immediate="true" />
<ice:commandButton value="#{messages_admin['common.cancel']}"
action="#{createOrModifyPreference.closePopup}" immediate="true"
- id="cancel" styleClass="button"
- title="#{messages_admin['common.cancel']}" />
+ styleClass="button" title="#{messages_admin['common.cancel']}" />
</ice:panelGroup>
</f:facet>
</ice:panelBorder>
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 04cb438..39bf0d0 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
@@ -38,9 +38,10 @@
<ice:panelGroup styleClass="clearing" />
<ice:panelGroup>
<ice:inputText value="#{prefManagerBean.prefSearchTxt}"
- style="width: 305px;margin-left:10px;margin-right:10px;" partialSubmit="true">
+ style="width: 305px;margin-left:10px;margin-right:10px;"
+ partialSubmit="true">
</ice:inputText>
- <ice:commandButton id="submitSearch"
+ <ice:commandButton
value="#{prefManagerBean.messages['searchPrefStore.label']}"
action="#{prefManagerBean.performSearch}" styleClass="button" />
</ice:panelGroup>
diff --git a/admin-portal/src/main/resources/admin-portal-messages.properties b/admin-portal/src/main/resources/admin-portal-messages.properties
index 2565be5..49aa8af 100644
--- a/admin-portal/src/main/resources/admin-portal-messages.properties
+++ b/admin-portal/src/main/resources/admin-portal-messages.properties
@@ -655,3 +655,4 @@ views.prefManagerBean.modifyPreference.delete.label=Delete Preference
views.prefManagerBean.modifyPreference.confirmDelPref.warn=This will delete the selected preference from the preference store.
views.prefManagerBean.modifyPreference.confirmDelPref.error=Please select preference to delete.
views.prefManagerBean.modifyPreference.confirmEditPref.error=Please select preference to edit.
+views.prefManagerBean.modifyPreference.confirmAddPref.error=Please select User to save preference.
diff --git a/admin-portal/src/main/resources/admin-portal-messages_de.properties b/admin-portal/src/main/resources/admin-portal-messages_de.properties
index 3c4f8cc..4d84a23 100644
--- a/admin-portal/src/main/resources/admin-portal-messages_de.properties
+++ b/admin-portal/src/main/resources/admin-portal-messages_de.properties
@@ -635,3 +635,23 @@ views.qaManagementView.toolbar.restoreQA.title = +Clear/Use Model Default
views.qaManagementView.departments.label = +Departments
views.qaManagementView.department.label = +Department
views.qaManagementView.qaError = +Enter a whole percentage between 0 and 100, or leave blank to apply the QA % specified in the model.
+
+#Preference Manager View
+views.prefManagerBean.label=+Preference Store Manager
+views.prefManagerBean.tenant.label=+Search Tenant Preferences
+views.prefManagerBean.user.label=+Search User Preferences
+views.prefManagerBean.scope.label=+Scope
+views.prefManagerBean.moduleId.label=+Module ID
+views.prefManagerBean.preferenceId.label=+Preference ID
+views.prefManagerBean.preferenceName.label=+Preference Name
+views.prefManagerBean.preferenceValue.label=+Value
+views.prefManagerBean.searchPrefStore.label=+Search
+views.prefManagerBean.modifyPreference.add.title=+Add Preference
+views.prefManagerBean.modifyPreference.edit.title=+Edit Preference
+views.prefManagerBean.modifyPreference.tenant.label=+Tenant
+views.prefManagerBean.modifyPreference.user.label=+User
+views.prefManagerBean.modifyPreference.delete.label=+Delete Preference
+views.prefManagerBean.modifyPreference.confirmDelPref.warn=+This will delete the selected preference from the preference store.
+views.prefManagerBean.modifyPreference.confirmDelPref.error=+Please select preference to delete.
+views.prefManagerBean.modifyPreference.confirmEditPref.error=+Please select preference to edit.
+views.prefManagerBean.modifyPreference.confirmAddPref.error=+Please select User to save preference.
diff --git a/admin-portal/src/main/resources/admin-portal-messages_zh_CN.properties b/admin-portal/src/main/resources/admin-portal-messages_zh_CN.properties
index 41407d8..8b1e67c 100644
--- a/admin-portal/src/main/resources/admin-portal-messages_zh_CN.properties
+++ b/admin-portal/src/main/resources/admin-portal-messages_zh_CN.properties
@@ -635,3 +635,23 @@ views.qaManagementView.toolbar.restoreQA.title = \u6E05\u9664/\u4F7F\u7528\u6A21
views.qaManagementView.departments.label = \u90E8\u95E8
views.qaManagementView.department.label = \u90E8\u95E8
views.qaManagementView.qaError = \u8F93\u5165\u767E\u5206\u6BD4\uFF08\u5206\u5B50\u4E3A0\u5230100\u95F4\u7684\u6574\u6570\uFF09\uFF0C\u6216\u8005\u7559\u7A7A\u4EE5\u5E94\u7528\u6A21\u578B\u4E2D\u6307\u5B9A\u7684QA%\u3002
+
+#Preference Manager View
+views.prefManagerBean.label=+Preference Store Manager
+views.prefManagerBean.tenant.label=+Search Tenant Preferences
+views.prefManagerBean.user.label=+Search User Preferences
+views.prefManagerBean.scope.label=+Scope
+views.prefManagerBean.moduleId.label=+Module ID
+views.prefManagerBean.preferenceId.label=+Preference ID
+views.prefManagerBean.preferenceName.label=+Preference Name
+views.prefManagerBean.preferenceValue.label=+Value
+views.prefManagerBean.searchPrefStore.label=+Search
+views.prefManagerBean.modifyPreference.add.title=+Add Preference
+views.prefManagerBean.modifyPreference.edit.title=+Edit Preference
+views.prefManagerBean.modifyPreference.tenant.label=+Tenant
+views.prefManagerBean.modifyPreference.user.label=+User
+views.prefManagerBean.modifyPreference.delete.label=+Delete Preference
+views.prefManagerBean.modifyPreference.confirmDelPref.warn=+This will delete the selected preference from the preference store.
+views.prefManagerBean.modifyPreference.confirmDelPref.error=+Please select preference to delete.
+views.prefManagerBean.modifyPreference.confirmEditPref.error=+Please select preference to edit.
+views.prefManagerBean.modifyPreference.confirmAddPref.error=+Please select User to save preference.