Skip to content
Permalink
Browse files

Fix naming collision

  • Loading branch information...
flack committed Aug 13, 2019
1 parent e5577e9 commit 2f61ccf2cc183d94100d4d3918385acbbc18b985
@@ -126,10 +126,10 @@ public function _show_generator($handler_id, array &$data)
// Quick workaround to Bergies lazy determination of whether this is user's or everyone's report...
if ($data['query_data']['resource'] == 'user:' . midcom::get()->auth->user->guid) {
// My report
$data['handler_id'] = 'deliverable_report';
$data['report_type'] = 'deliverable_report';
} else {
// Generic report
$data['handler_id'] = 'sales_report';
$data['report_type'] = 'sales_report';
}
midcom_show_style('sales_report-deliverable-grid');
@@ -16,7 +16,7 @@
]);
$grid->set_column('invoice', $invoices_l10n->get('invoice number'), 'width: 85, align: "center", fixed: true', 'integer');
if ($data['handler_id'] != 'deliverable_report') {
if ($data['report_type'] != 'deliverable_report') {
$grid->set_column('owner', $sales_l10n->get('owner'), 'width: 80', 'string');
}
$grid->set_column('customer', $sales_l10n->get('customer'));
@@ -31,7 +31,7 @@
<?php
echo ' ' . midcom::get()->i18n->get_string('group by', 'org.openpsa.core') . ': ';
echo '<select id="chgrouping_' . $grid_id . '">';
if ($data['handler_id'] != 'deliverable_report') {
if ($data['report_type'] != 'deliverable_report') {
echo '<option value="owner">' . $sales_l10n->get('owner') . "</option>\n";
}

0 comments on commit 2f61ccf

Please sign in to comment.
You can’t perform that action at this time.