Skip to content

Commit aa7fcba

Browse files
committed
Fixed a bug with multiple inheritance tracking of model and result
1 parent 25f21ce commit aa7fcba

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/main/java/org/computate/frFR/java/IndexerClasse.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2433,11 +2433,15 @@ else if(!StringUtils.contains(classeNomCanoniqueSuper, ".") && StringUtils.isNot
24332433
Boolean classeEtendModeleBase = indexerStockerSolr(classeDoc, "classeEtendModeleBase"
24342434
, classePartsModeleBase != null
24352435
&& classeNomSimpleSuperGenerique != null
2436-
&& classeNomSimpleSuperGenerique.equals(classePartsModeleBase.nomSimple(langueNomGlobale)));
2436+
&& (classeNomSimpleSuperGenerique.equals(classePartsModeleBase.nomSimple(langueNomGlobale))
2437+
|| (classeSuperDoc != null && (Boolean)classeSuperDoc.get("classeEtendModeleBase_stored_boolean"))
2438+
));
24372439
Boolean classeEtendResultatBase = indexerStockerSolr(classeDoc, "classeEtendResultatBase"
24382440
, classePartsResultatBase != null
24392441
&& classeNomSimpleSuperGenerique != null
2440-
&& classeNomSimpleSuperGenerique.equals(classePartsResultatBase.nomSimple(langueNomGlobale)));
2442+
&& (classeNomSimpleSuperGenerique.equals(classePartsResultatBase.nomSimple(langueNomGlobale))
2443+
|| (classeSuperDoc != null && (Boolean)classeSuperDoc.get("classeEtendResultatBase_stored_boolean"))
2444+
));
24412445
indexerStockerSolr(classeDoc, "classeInitLoinAvant" , regexTrouve("^" + i18nGlobale.getString(I18n.var_InitLoin) + i18nGlobale.getString(I18n.var_Avant) + ": (true)$", classeCommentaire));
24422446
if(activerVertx) {
24432447
if(classeEtendBase) {

0 commit comments

Comments
 (0)