QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 05:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
darin.kelkhoff
2024-07-19 16:25:15 -05:00
parent 028751e23a
commit fa2b1c0b8e
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/GenerateReportAction.java
View File

@ -443,13 +443,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
queryInput.withQueryHint(QueryHint.MAY_USE_READ_ONLY_BACKEND); queryInput.withQueryHint(QueryHint.MAY_USE_READ_ONLY_BACKEND);
queryInput.setShouldTranslatePossibleValues(true); queryInput.setShouldTranslatePossibleValues(true);
<<<<<<< HEAD
queryInput.setFieldsToTranslatePossibleValues(setupFieldsToTranslatePossibleValues(reportInput, dataSource)); queryInput.setFieldsToTranslatePossibleValues(setupFieldsToTranslatePossibleValues(reportInput, dataSource));
||||||| parent of a9eb8946 (Remove all calls to actionInput.getInstance and getSesssion, in favor of the equivallent methods from QContext)
queryInput.setFieldsToTranslatePossibleValues(setupFieldsToTranslatePossibleValues(reportInput, dataSource, new JoinsContext(reportInput.getInstance(), dataSource.getSourceTable(), dataSource.getQueryJoins(), queryInput.getFilter())));
=======
queryInput.setFieldsToTranslatePossibleValues(setupFieldsToTranslatePossibleValues(reportInput, dataSource, new JoinsContext(QContext.getQInstance(), dataSource.getSourceTable(), dataSource.getQueryJoins(), queryInput.getFilter())));
>>>>>>> a9eb8946 (Remove all calls to actionInput.getInstance and getSesssion, in favor of the equivallent methods from QContext)
if(dataSource.getQueryInputCustomizer() != null) if(dataSource.getQueryInputCustomizer() != null)
{ {
@ -806,7 +800,6 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
List<QReportView> reportViews = views.stream().filter(v -> v.getType().equals(ReportType.SUMMARY)).toList(); List<QReportView> reportViews = views.stream().filter(v -> v.getType().equals(ReportType.SUMMARY)).toList();
for(QReportView view : reportViews) for(QReportView view : reportViews)
{ {
<<<<<<< HEAD
QReportDataSource dataSource = getDataSource(view.getDataSourceName()); QReportDataSource dataSource = getDataSource(view.getDataSourceName());
if(dataSource == null) if(dataSource == null)
{ {
@ -815,15 +808,6 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
QTableMetaData table = QContext.getQInstance().getTable(dataSource.getSourceTable()); QTableMetaData table = QContext.getQInstance().getTable(dataSource.getSourceTable());
SummaryOutput summaryOutput = computeSummaryRowsForView(reportInput, view, table); SummaryOutput summaryOutput = computeSummaryRowsForView(reportInput, view, table);
||||||| parent of a9eb8946 (Remove all calls to actionInput.getInstance and getSesssion, in favor of the equivallent methods from QContext)
QReportDataSource dataSource = getDataSource(view.getDataSourceName());
QTableMetaData table = reportInput.getInstance().getTable(dataSource.getSourceTable());
SummaryOutput summaryOutput = computeSummaryRowsForView(reportInput, view, table);
=======
QReportDataSource dataSource = getDataSource(view.getDataSourceName());
QTableMetaData table = QContext.getQInstance().getTable(dataSource.getSourceTable());
SummaryOutput summaryOutput = computeSummaryRowsForView(reportInput, view, table);
>>>>>>> a9eb8946 (Remove all calls to actionInput.getInstance and getSesssion, in favor of the equivallent methods from QContext)
ExportInput exportInput = new ExportInput(); ExportInput exportInput = new ExportInput();
exportInput.setReportDestination(reportInput.getReportDestination()); exportInput.setReportDestination(reportInput.getReportDestination());