From 0fa7d14a74642693e5c2aec8661dc06a15381b11 Mon Sep 17 00:00:00 2001
From: Eike Foken <kontakt@eikefoken.de>
Date: Wed, 14 Sep 2011 23:03:24 +0200
Subject: [PATCH] Add configuration to experiment detail pages

---
 application/controllers/experiments.php | 1 +
 application/models/experiment.php       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/experiments.php b/application/controllers/experiments.php
index d8ccc7d..0cdb7de 100644
--- a/application/controllers/experiments.php
+++ b/application/controllers/experiments.php
@@ -161,6 +161,7 @@ class Experiments extends CI_Controller {
 		$this->load->helper('typography');
 
 		$data['experiment'] = $experiment;
+		$data['parameters'] = $this->experiment->getParameters($experiment['id']);
 		$data['job'] = $this->job->getByExperimentId($experiment['id']);
 		$data['project'] = $this->project->getById($experiment['project_id']);
 
diff --git a/application/models/experiment.php b/application/models/experiment.php
index 6dd6442..be9247a 100644
--- a/application/models/experiment.php
+++ b/application/models/experiment.php
@@ -103,7 +103,7 @@ class Experiment extends CI_Model {
 	 * @return array
 	 */
 	public function getParameters($experimentId) {
-		$this->db->select('experiments_parameters.*, parameters.name AS `name`, parameters.type AS `type`');
+		$this->db->select('experiments_parameters.*, parameters.readable, parameters.name, parameters.type, parameters.unit');
 		$this->db->join('parameters', 'experiments_parameters.parameter_id = parameters.id', 'left');
 		$this->db->where('experiment_id', $experimentId);