Skip to content

Commit

Permalink
fix: Context columns on smart browse. (#34)
Browse files Browse the repository at this point in the history
  • Loading branch information
EdwinBetanc0urt authored Jun 4, 2024
1 parent 7cb497c commit 42b4f71
Showing 1 changed file with 21 additions and 1 deletion.
22 changes: 21 additions & 1 deletion src/main/java/org/spin/eca56/util/support/documents/Browser.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;

import org.adempiere.core.domains.models.I_AD_Browse;
import org.adempiere.core.domains.models.I_AD_Browse_Field;
import org.adempiere.core.domains.models.I_AD_Element;
import org.adempiere.core.domains.models.I_AD_View_Column;
import org.adempiere.model.MBrowse;
import org.adempiere.model.MBrowseField;
import org.adempiere.model.MViewColumn;
Expand Down Expand Up @@ -109,8 +111,26 @@ public DictionaryDocument withEntity(PO entity) {
Map<String, Object> referenceDetail = parseDictionaryEntity(window);
documentDetail.put("window", referenceDetail);
}

String queryClause = new Query(
browser.getCtx(),
I_AD_View_Column.Table_Name,
"AD_View_ID = ? AND ColumnSQL LIKE '%@%' ",
null
)
.setParameters(browser.getAD_View_ID())
.setOnlyActiveRecords(true)
.<MViewColumn>list()
.stream()
.map(viewColumn -> {
return viewColumn.getColumnSQL();
})
.collect(Collectors.joining(" "))
;

documentDetail.put("context_column_names", ReferenceUtil.getContextColumnNames(
Optional.ofNullable(browser.getWhereClause()).orElse("")
Optional.ofNullable(queryClause).orElse("")
+ Optional.ofNullable(browser.getWhereClause()).orElse("")
)
);

Expand Down

0 comments on commit 42b4f71

Please sign in to comment.