Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 8a9fe14

Browse files
author
mgrauer
committed
Tracker GUI takes params from tracker_param
Conflicts: modules/tracker/views/scalar/details.phtml
1 parent 4f83b1f commit 8a9fe14

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

modules/tracker/controllers/ScalarController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function detailsAction()
5757

5858
$this->view->isAdmin = $this->Tracker_Scalar->policyCheck($scalarDao, $this->userSession->Dao, MIDAS_POLICY_ADMIN);
5959
$this->view->scalar = $scalarDao;
60-
$this->view->extraParams = json_decode($scalarDao->getParams(), true);
60+
$this->view->extraParams = $scalarDao->getParams();
6161
$this->view->extraUrls = json_decode($scalarDao->getExtraUrls(), true);
6262

6363
$revisionUrl = $scalarDao->getTrend()->getProducer()->getRevisionUrl();

modules/tracker/views/scalar/details.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ if (count($this->extraParams)) {
113113
<tbody>
114114
<?php
115115
/** @var Tracker_ParamDao $param */
116-
foreach ($this->extraParams as $key => $value) {
117-
echo '<tr><th>'.$this->escape($key).':</th><td>'.$this->escape($value).'</td></tr>';
116+
foreach ($this->extraParams as $param) {
117+
echo '<tr><th>'.$this->escape($param->getParamName()).':</th><td>'.$this->escape($param->getParamValue()).'</td></tr>';
118118
}
119119
?>
120120
</tbody>

0 commit comments

Comments
 (0)