[Projekt: Entwicklung - Neon][TicketNr.: 1072996][[Schlüsselwörter] Inaktiv...

[Projekt: Entwicklung - Neon][TicketNr.: 1072996][[Schlüsselwörter] Inaktiv setzen bewirkt nicht, dass das Schlüsselwort nicht mehr in der Auswahl erscheint - bei Schlüsselwort ADDRESSTYPE]

entity/AddressType_entity/recordcontainers/db/conditionProcess.js

@@ -16,6 +16,7 @@ if (usageFilter)
     cond.and("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID", 
                 keywordAttribute.getSqlBuilderSelect().and(["AB_KEYWORD_ATTRIBUTERELATION", keywordAttribute.dbField], "1"),
             SqlBuilder.IN())
+        .and("AB_KEYWORD_ENTRY.ISACTIVE", "1");
 }
 
 result.string(cond.toString());
\ No newline at end of file

entity/KeywordEntry_entity/KeywordEntry_entity.aod

@@ -842,6 +842,8 @@
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <isSortable v="true" />
       <contentProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <cacheType>SESSION</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/jdito/cacheKeyProcess.js</cacheKeyProcess>
       <recordFieldMappings>
         <jDitoRecordFieldMapping>
           <name>KEYID.value</name>

entity/KeywordEntry_entity/recordcontainers/jdito/cacheKeyProcess.js

+import("CachedRecordContainer_lib");
+import("system.result")
+
+var res = CachedRecordContainerUtils.getCommonKey("$param.ContainerName_param","$param.OnlyActives_param");
+result.string(res);

entity/KeywordEntry_entity/recordcontainers/jdito/contentProcess.js

@@ -19,7 +19,12 @@ var resultSet = [];
 var keywordStatement = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE, AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID as UID")
                 .from("AB_KEYWORD_ENTRY")
                 .join("AB_KEYWORD_CATEGORY", "AB_KEYWORD_ENTRY.AB_KEYWORD_CATEGORY_ID = AB_KEYWORD_CATEGORY.AB_KEYWORD_CATEGORYID")
-                ;
+                .where();
+            
+if (vars.get("$param.OnlyActives_param") == "true")
+{
+    keywordStatement.and("AB_KEYWORD_ENTRY.ISACTIVE", "1");
+}
             
 if(vars.exists("$param.ContainerName_param"))
 {
@@ -50,9 +55,9 @@ if(vars.exists("$param.ContainerName_param"))
                 break;
     }
     
-                            
+    
     resultSet = keywordStatement
-                    .where("AB_KEYWORD_CATEGORY.NAME", containerParam)
+                    .and("AB_KEYWORD_CATEGORY.NAME", containerParam)
                     .orderBy(sortingField + " " + sortingDirection)
                     .table()
                     ;