FINERACT-1759-Datatable-extension-Share-products
This commit is contained in:
committed by
Arnold Gálovics
parent
6fd67b19dd
commit
d131055c5a
+2
-1
@@ -63,6 +63,7 @@ public class DatatableCommandFromApiJsonDeserializer {
|
||||
public static final String M_OFFICE = "m_office";
|
||||
public static final String M_SAVINGS_PRODUCT = "m_savings_product";
|
||||
public static final String M_PRODUCT_LOAN = "m_product_loan";
|
||||
public static final String M_SHARE_PRODUCT = "m_share_product";
|
||||
public static final String NEW_NAME = "newName";
|
||||
public static final String STRING = "string";
|
||||
public static final String NUMBER = "number";
|
||||
@@ -92,7 +93,7 @@ public class DatatableCommandFromApiJsonDeserializer {
|
||||
private static final Set<String> SUPPORTED_PARAMETERS_FOR_DROP_COLUMNS = new HashSet<>(List.of(NAME));
|
||||
private static final Object[] SUPPORTED_COLUMN_TYPES = { STRING, NUMBER, BOOLEAN, DECIMAL, DATE, DATETIME, TEXT, DROPDOWN };
|
||||
private static final Object[] SUPPORTED_APPTABLE_NAMES = { M_LOAN, M_SAVINGS_ACCOUNT, M_CLIENT, M_GROUP, M_CENTER, M_OFFICE,
|
||||
M_SAVINGS_PRODUCT, M_PRODUCT_LOAN };
|
||||
M_SAVINGS_PRODUCT, M_PRODUCT_LOAN, M_SHARE_PRODUCT };
|
||||
|
||||
private final FromJsonHelper fromApiJsonHelper;
|
||||
|
||||
|
||||
+5
-1
@@ -1798,7 +1798,8 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
|
||||
+ " where o.hierarchy like '" + currentUser.getOffice().getHierarchy() + "%'" + " and o.id = " + appTableId;
|
||||
}
|
||||
|
||||
if (appTable.equalsIgnoreCase("m_product_loan") || appTable.equalsIgnoreCase("m_savings_product")) {
|
||||
if (appTable.equalsIgnoreCase("m_product_loan") || appTable.equalsIgnoreCase("m_savings_product")
|
||||
|| appTable.equalsIgnoreCase("m_share_product")) {
|
||||
scopedSQL = "select null as officeId, null as groupId, null as clientId, null as savingsId, null as loanId, p.id as entityId from "
|
||||
+ appTable + " as p WHERE p.id = " + appTableId;
|
||||
}
|
||||
@@ -1838,6 +1839,9 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
|
||||
if (appTable.equalsIgnoreCase("m_savings_product")) {
|
||||
return;
|
||||
}
|
||||
if (appTable.equalsIgnoreCase("m_share_product")) {
|
||||
return;
|
||||
}
|
||||
|
||||
throw new PlatformDataIntegrityException("error.msg.invalid.application.table", "Invalid Application Table: " + appTable, "name",
|
||||
appTable);
|
||||
|
||||
Reference in New Issue
Block a user