Author: bpapez
Date: Sat Jun 16 08:39:32 2007
New Revision: 17608
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17608&repname=
=3Djahia
Log:
Problem when creating pages in all languages, if for instance both a genera=
l and a country specific language ("en" and "en_US") is active
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/data/fields/JahiaContentFi=
eldFacade.java
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/data/fields/JahiaCon=
tentFieldFacade.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/data/fields/JahiaContentFieldFacade.java&rev=3D1760=
8&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-4-1-BRANCH/src/java/org/jahia/data/fields/JahiaContentFi=
eldFacade.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/data/fields/JahiaContentFi=
eldFacade.java Sat Jun 16 08:39:32 2007
@@ -230,7 +230,7 @@
activeAndStagingEntryStates.add(entryStateKey);
}
} catch ( Throwable t ){
- t.printStackTrace();
+ logger.error("Cannot load field!", t);
}
}
=
@@ -295,23 +295,27 @@
.getJahiaVersionService()
.resolveEntry(activeAndStagingEn=
tryStates,
entryLoadRequest);
- if ( entryState =3D=3D null ){
+ if ( ( entryState =3D=3D null ) ||
+ ((!entryState.getLanguageCode().equals("shared")) &&
+ (!entryState.getLanguageCode().equals(locale.toStrin=
g()))) ) {
+ // second case can happen because we might have resolv=
ed to "simpler" language
+ // in case of "composed" language code. For exemple we=
resolved "en" from "en_US".
+ // in the case of resolving to a shared language, we i=
gnore the check of a simpler
+ // language.
=
entryLoadRequest =3D new EntryLoadRequest(
ContentObjectEntryState.WORKFLOW_STATE_ST=
ART_STAGING,
0, entryLocales);
- entryState =3D (ContentObjectEntryState)ServicesRegistry.=
getInstance()
+ ContentObjectEntryState entryStateStaging =3D (ContentObj=
ectEntryState)ServicesRegistry.getInstance()
.getJahiaVersionService()
.resolveEntry(activeAndStagi=
ngEntryStates,
entryLoadRequ=
est);
+ if (entryStateStaging !=3D null)
+ entryState =3D entryStateStaging;
}
if ( ( entryState =3D=3D null ) ||
((!entryState.getLanguageCode().equals("shared")) &&
(!entryState.getLanguageCode().equals(locale.toString()=
))) ) {
- // second case can happen because we might have resolved =
to "simpler" language
- // in case of "composed" language code. For exemple we re=
solved "en" from "en_US".
- // in the case of resolving to a shared language, we igno=
re the check of a simpler
- // language.
=
// have to create a staged
JahiaField field =3D
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
