Author: ktlili
Date: Wed Jun 20 16:00:40 2007
New Revision: 17671
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17671&repname=
=3Djahia
Log:
- fix bug: remove npe when adding box with portlet field =3D=3D null (only =
SP, no JIRA)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/App=
lication_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Application_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Application_Field.java&rev=
=3D17671&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/App=
lication_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/App=
lication_Field.java Wed Jun 20 16:00:40 2007
@@ -306,7 +306,10 @@
Integer appID =3D new Integer(selectedAppID);
// Try to recover application role members
appRoleMembers =3D (HashMap) engineMap.get(APPLICATION_ROLES);
- ArrayList roleMembersList =3D (ArrayList) appRoleMembers.get(a=
ppID);
+ ArrayList roleMembersList =3D null;
+ if(appRoleMembers !=3D null){
+ roleMembersList =3D (ArrayList) appRoleMembers.get(appID);
+ }
if (roleMembersList =3D=3D null) {
return false;
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/application_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp&rev=
=3D17671&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field.jsp Wed Jun 20 16:00:40 2007
@@ -157,7 +157,7 @@
<%}%>
</ul>
<br/>
-<% if (unAuthorizedOnCurrentlySelectedWebapp) {%>
+<% if (unAuthorizedOnCurrentlySelectedWebapp && appID !=3D -1) {%>
=
<div class=3D"errorbold">
<jahia:engineResourceBundle
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/application_field_displayTag.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/application_field_displayT=
ag.inc&rev=3D17671&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc Wed Jun 20 16:00:40 2007
@@ -167,7 +167,13 @@
selectedFieldId =3D jParams.getParameter("_" + Integer.toString(th=
eField.getID()));
}
if(selectedFieldId =3D=3D null){
+ selectedFieldId =3D ""+appID;
+ if(selectedEntryPointDefName !=3D null){
selectedFieldId =3D appID+"_"+selectedEntryPointDefName;
+ }
+ }
+ if(selectedFieldId =3D=3D null){
+ selectedFieldId =3D "-1";
}
=
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
