diff --git a/module/bi/model.php b/module/bi/model.php index 4031cddd7c..4b4383bca5 100644 --- a/module/bi/model.php +++ b/module/bi/model.php @@ -1959,7 +1959,7 @@ class biModel extends model * @access public * @return array */ - public function convertDataForDtable(object $data, array $configs, string $version): array + public function convertDataForDtable(object $data, array $configs, string $version, string $status): array { $columns = array(); $rows = array(); @@ -2098,6 +2098,7 @@ class biModel extends model $rows[$rowKey]['isTotal'] = $totalColspan > 0; $rows[$rowKey]['ROW_ID'] = $rowKey; $rows[$rowKey]['version'] = $version; + $rows[$rowKey]['status'] = $status; } foreach($columns as $field => $column) $columns[$field]['width'] = 16 * $columnMaxLen[$field]; diff --git a/module/pivot/js/common.ui.js b/module/pivot/js/common.ui.js index e39a82bb6f..80945e8cb0 100644 --- a/module/pivot/js/common.ui.js +++ b/module/pivot/js/common.ui.js @@ -4,6 +4,7 @@ window.clickCell = function(col, {colName, rowInfo}) const drillConditions = rowInfo.data.conditions[colName]; const isDrill = rowInfo.data.isDrill[colName]; const version = rowInfo.data.version; + const status = rowInfo.data.status; let value = rowInfo.data[colName]; if(!isDrill || rowInfo.data.field0_colspan) return false; @@ -12,7 +13,6 @@ window.clickCell = function(col, {colName, rowInfo}) let filterValues = {}; let originField = '0'; let id = window.pivotID; - let status = 'published'; if(Array.isArray(value)) value = value[0]; value = (value + '').replace('%', ''); @@ -25,7 +25,6 @@ window.clickCell = function(col, {colName, rowInfo}) } conditions = latin1ToBase64(JSON.stringify(conditions)) filterValues = latin1ToBase64(JSON.stringify(filterValues)) - if(typeof(pivotState) != 'undefined') status = 'design'; let drillModalLink = $.createLink('pivot', 'drillModal', `pivotID=${id}&version=${version}&colName=${originField}&status=${status}&conditions=${conditions}&filterValues=${filterValues}&value=${value}`); drillModalLink = drillModalLink.replace(/\+/g, '%2B'); diff --git a/module/pivot/ui/show.html.php b/module/pivot/ui/show.html.php index 228ca1cf46..7f47c09007 100644 --- a/module/pivot/ui/show.html.php +++ b/module/pivot/ui/show.html.php @@ -59,7 +59,7 @@ $generateData = function() use ($lang, $groupID, $pivotName, $pivot, $data, $con { $clickable = $this->config->edition != 'open'; $emptyTip = $this->pivot->isFiltersAllEmpty($pivot->filters) ? $lang->pivot->filterEmptyVal : $lang->error->noData; - list($cols, $rows, $cellSpan) = $this->loadModel('bi')->convertDataForDtable($data, $configs, $pivot->version); + list($cols, $rows, $cellSpan) = $this->loadModel('bi')->convertDataForDtable($data, $configs, $pivot->version, 'published'); return array (