Tracker GUI takes params from tracker_param

Conflicts: modules/tracker/views/scalar/details.phtml
midasplatform · Oct 5, 2015 · 8a9fe14 · 8a9fe14
1 parent 4f83b1f
commit 8a9fe14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/tracker/controllers/ScalarController.php b/modules/tracker/controllers/ScalarController.php
@@ -57,7 +57,7 @@ public function detailsAction()
 
         $this->view->isAdmin = $this->Tracker_Scalar->policyCheck($scalarDao, $this->userSession->Dao, MIDAS_POLICY_ADMIN);
         $this->view->scalar = $scalarDao;
-        $this->view->extraParams = json_decode($scalarDao->getParams(), true);
+        $this->view->extraParams = $scalarDao->getParams();
         $this->view->extraUrls = json_decode($scalarDao->getExtraUrls(), true);
 
         $revisionUrl = $scalarDao->getTrend()->getProducer()->getRevisionUrl();

diff --git a/modules/tracker/views/scalar/details.phtml b/modules/tracker/views/scalar/details.phtml
@@ -113,8 +113,8 @@ if (count($this->extraParams)) {
             <tbody>
             <?php
             /** @var Tracker_ParamDao $param */
-            foreach ($this->extraParams as $key => $value) {
-                echo '<tr><th>'.$this->escape($key).':</th><td>'.$this->escape($value).'</td></tr>';
+            foreach ($this->extraParams as $param) {
+                echo '<tr><th>'.$this->escape($param->getParamName()).':</th><td>'.$this->escape($param->getParamValue()).'</td></tr>';
             }
             ?>
             </tbody>