Merge branch 'master' of disposed.de:scattport

This commit is contained in:
Karsten Heiken
2011-08-25 21:36:55 +02:00
6 changed files with 97 additions and 6 deletions

View File

@@ -114,7 +114,7 @@ class Projects extends CI_Controller {
if (isset($data['project_id'])) {
$this->load->helper('directory');
$projectPath = FCPATH.'uploads/'.$this->session->userdata('user_id').'/'.$data['project_id'].'/';
$projectPath = FCPATH . 'uploads/' . $data['project_id'] . '/';
mkdirs($projectPath);
if ($modelUploaded) {

View File

@@ -25,7 +25,7 @@
* Trials are used to store different variations of the same project.
*
* @author Karsten Heiken <karsten@disposed.de>
* @author Eike Foken <kontakt@eikefoken.de>
* @author Eike Foken <kontakts@eikefoken.de>
*/
class Trials extends CI_Controller {
@@ -84,10 +84,13 @@ class Trials extends CI_Controller {
}
$this->load->helper('directory');
$trialPath = FCPATH.'uploads/'.$this->session->userdata('user_id').'/'.$projectId.'/'. $trialId.'/';
$trialPath = FCPATH . 'uploads/' . $projectId . '/' . $trialId . '/';
mkdirs($trialPath);
redirect('trials/detail/' . $trialId, 'refresh');
$this->load->library('job');
$this->job->createConfigs($trialId);
//redirect('trials/detail/' . $trialId, 'refresh');
} else {
$this->messages->add(_('The trial could not be created.'), 'error');
}