You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2008/11/26 12:30:37 UTC
svn commit: r720811 - in
/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src:
main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java
webapp/WEB-INF/view/pam-detail.jsp
Author: woonsan
Date: Wed Nov 26 03:30:24 2008
New Revision: 720811
URL: http://svn.apache.org/viewvc?rev=720811&view=rev
Log:
fixed NPE and usage of UserAttribute in jsp
Modified:
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java
portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/webapp/WEB-INF/view/pam-detail.jsp
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java?rev=720811&r1=720810&r2=720811&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/main/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java Wed Nov 26 03:30:24 2008
@@ -98,8 +98,11 @@
throw new PortletException("You must specfiy a value for the new preference "+newName);
}
- List<Preference> prefList = entity.getFragment().getPreferences();
- //prefLis.add(newName, Arrays.asList(newValues));
+ List<Preference> prefList = null;
+ if (entity.getFragment() != null)
+ prefList = entity.getFragment().getPreferences();
+ //prefLis.add(newName, Arrays.asList(newValues));
+
try
{
entityAccess.storePortletEntity(entity);
Modified: portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/webapp/WEB-INF/view/pam-detail.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/webapp/WEB-INF/view/pam-detail.jsp?rev=720811&r1=720810&r2=720811&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/webapp/WEB-INF/view/pam-detail.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/JS2-871-refactoring/src/webapp/WEB-INF/view/pam-detail.jsp Wed Nov 26 03:30:24 2008
@@ -138,7 +138,7 @@
<c:out value="${userAttr.name}"/>
</td>
<td class="portlet-section-body">
- <input type="text" name="<c:out value="${userAttr.name}"/>:description" value="<c:out value="${userAttr.description}"/>" class="portlet-form-field-label"/>
+ <input type="text" name="<c:out value="${userAttr.name}"/>:description" value="<%=((UserAttribute) pageContext.getAttribute("userAttr")).getDescription(renderRequest.getLocale()).getDescription()%>" class="portlet-form-field-label"/>
</td>
</tr>
</c:forEach>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org