Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/114502
Change subject: Display generated report SQL in the UI
......................................................................
Display generated report SQL in the UI
Change-Id: I327578dc778096086b5692a0d048ccd1271cf097
---
M CRM/Report/Form.php
M templates/CRM/Report/Form/Fields.tpl
2 files changed, 17 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm
refs/changes/02/114502/1
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index a7d715b..9dfb3b5 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -2143,6 +2143,7 @@
function doTemplateAssignment(&$rows) {
$this->assign_by_ref('columnHeaders', $this->_columnHeaders);
$this->assign_by_ref('rows', $rows);
+ $this->assign('reportSql', $this->sql);
$this->assign('statistics', $this->statistics($rows));
}
@@ -2421,11 +2422,11 @@
$this->beginPostProcess();
// build query
- $sql = $this->buildQuery();
+ $this->sql = $this->buildQuery();
// build array of result based on column headers. This method also allows
// modifying column headers before using it to build result set i.e $rows.
- $this->buildRows($sql, $rows);
+ $this->buildRows($this->sql, $rows);
// format result set.
$this->formatDisplay($rows);
diff --git a/templates/CRM/Report/Form/Fields.tpl
b/templates/CRM/Report/Form/Fields.tpl
index 1a92094..e346755 100644
--- a/templates/CRM/Report/Form/Fields.tpl
+++ b/templates/CRM/Report/Form/Fields.tpl
@@ -72,6 +72,20 @@
{/if}
{/if} {* settings section ends *}
+<div class="crm-accordion-wrapper crm-report_query-accordion
crm-accordion_title-accordion crm-accordion-closed">
+ <div class="crm-accordion-header">
+ <div class="icon crm-accordion-pointer"></div>
+ {ts}Report SQL{/ts}
+ </div><!-- /.crm-accordion-header -->
+ <div class="crm-accordion-body">
+ <div id="query_{$instanceForm}">
+ <pre>
+ {$reportSql}
+ </pre>
+ </div>
+ </div>
+</div>
+
{literal}
<script type="text/javascript">
cj(function() {
--
To view, visit https://gerrit.wikimedia.org/r/114502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I327578dc778096086b5692a0d048ccd1271cf097
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Adamw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits