Author: sshyrkov
Date: Thu Sep 6 20:02:46 2007
New Revision: 18385
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18385&repname=
=3Djahia
Log:
VOD-47: No "Source" Link on Linked Copies
http://www.jahia.net/jira/browse/VOD-47
Resolution: check if the page field has an empty value
Modified:
trunk/core/src/webapp/jsp/jahia/engines/importexport/dispPickers.jsp
Modified: trunk/core/src/webapp/jsp/jahia/engines/importexport/dispPickers.=
jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/importexport/dispPickers.jsp&rev=3D18385&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
--- trunk/core/src/webapp/jsp/jahia/engines/importexport/dispPickers.jsp (o=
riginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/importexport/dispPickers.jsp Th=
u Sep 6 20:02:46 2007
@@ -140,14 +140,16 @@
if (contentField instanceof ContentPageField) {
logger.debug("enter step3:object is Contentpage fi=
eld");
ContentPage contentPage =3D ((ContentPageField) co=
ntentField).getContentPage(lr);
- thepage=3DcontentPage;
- t =3D contentPage.getTitle(lr);
- if (thepage.getPageType(EntryLoadRequest.STAGED) =
=3D=3D JahiaPage.TYPE_DIRECT) {
- isPage =3D true;
- pageID =3D contentPage.getID();
- siteID =3D contentPage.getSiteID();
- logger.debug("page value key=3D" + t);
- break;
+ if (contentPage !=3D null) {
+ thepage=3DcontentPage;
+ t =3D contentPage.getTitle(lr);
+ if (thepage.getPageType(EntryLoadRequest.STAGE=
D) =3D=3D JahiaPage.TYPE_DIRECT) {
+ isPage =3D true;
+ pageID =3D contentPage.getID();
+ siteID =3D contentPage.getSiteID();
+ logger.debug("page value key=3D" + t);
+ break;
+ }
}
}
}
@@ -291,7 +293,7 @@
ContentField contentField =3D (ContentField) iterator1=
.next();
if (contentField instanceof ContentPageField) {
ContentPage contentPage =3D ((ContentPageField) co=
ntentField).getContentPage(EntryLoadRequest.STAGED);
- if (contentPage.getPageType(EntryLoadRequest.STAGE=
D) =3D=3D JahiaPage.TYPE_DIRECT) {
+ if (contentPage!=3D null && contentPage.getPageTyp=
e(EntryLoadRequest.STAGED) =3D=3D JahiaPage.TYPE_DIRECT) {
isPage =3D true;
break;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
