Skip to content

Commit

Permalink
Merge branch 'develop' into feature/solop-develop/spuy
Browse files Browse the repository at this point in the history
  • Loading branch information
EdwinBetanc0urt committed Nov 28, 2024
2 parents f39c680 + e5280ee commit 30c2dfa
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ configurations.all {
resolutionStrategy {
// used by aws-java-sdk-core (storefront is joda-time-2.10.4)
force("joda-time:joda-time:2.8.1")
// force("io.github.adempiere:adempiere-grpc-utils:local-1.0.0")
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.gradle.jvmargs=-Xmx4096M
systemProp.deploy.patchLibrary = com.solop:adempiere.solop_libs:3.9.4.001-spuy-0.0.1-rc-9
systemProp.deploy.patchLibrary = com.solop:adempiere.solop_libs:3.9.4.001-spuy-0.0.1-rc-9
19 changes: 19 additions & 0 deletions src/main/java/org/spin/grpc/service/UserInterface.java
Original file line number Diff line number Diff line change
Expand Up @@ -1852,7 +1852,26 @@ private org.spin.backend.grpc.user_interface.Callout.Builder runcallout(RunCallo
GridField gridField = new GridField(gridFieldVo);
// Init tab
GridTab gridTab = new GridTab(gridTabVo, gridWindow, true);

// set link column name by tab
gridTab.setLinkColumnName(null);
String linkColumn = gridTab.getLinkColumnName();
if (Util.isEmpty(linkColumn, true)) {
// set link column name by parent column
MTable table = MTable.get(Env.getCtx(), tab.getAD_Table_ID());
List<MColumn> columnsList = table.getColumnsAsList();
MColumn parentColumn = columnsList.parallelStream()
.filter(column -> {
return column.isParent();
})
.findFirst()
.orElse(null);
if (parentColumn != null && parentColumn.getAD_Column_ID() > 0) {
linkColumn = parentColumn.getColumnName();
gridTab.setLinkColumnName(linkColumn);
}
}

gridTab.query(false);
gridTab.clearSelection();
gridTab.dataNew(false);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/spin/grpc/service/ui/CalloutLogic.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ public static boolean isValidChange(GridField gridField) {
return false;
}
// Oly Displayed
if(!gridField.isDisplayed()) {
return false;
}
// if(!gridField.isDisplayed()) {
// return false;
// }
// Key
if(gridField.isKey()) {
return false;
Expand Down

0 comments on commit 30c2dfa

Please sign in to comment.