natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correctly uses the private/description from the template project.

Browse Source
This commit is contained in:
Loïc d'Anterroches 2010-08-11 14:50:32 +02:00
parent 7a2065c687
commit 3d1ac97dc3
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/IDF/Form/Admin/ProjectCreate.php
View File

@ -231,8 +231,18 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
$project = new IDF_Project(); $project = new IDF_Project();
$project->name = $this->cleaned_data['name']; $project->name = $this->cleaned_data['name'];
$project->shortname = $this->cleaned_data['shortname']; $project->shortname = $this->cleaned_data['shortname'];
if ($this->cleaned_data['template'] != '--') {
// Find the template project
$sql = new Pluf_SQL('shortname=%s',
array($this->cleaned_data['template']));
$tmpl = Pluf::factory('IDF_Project')->getOne(array('filter' => $sql->gen()));
$project->private = $tmpl->private;
$project->description = $tmpl->description;
} else {
$project->private = $this->cleaned_data['private_project']; $project->private = $this->cleaned_data['private_project'];
$project->description = __('Click on the Project Management tab to set the description of your project.'); $project->description = __('Click on the Project Management tab to set the description of your project.');
}
$project->create(); $project->create();
$conf = new IDF_Conf(); $conf = new IDF_Conf();
$conf->setProject($project); $conf->setProject($project);
@ -244,12 +254,6 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
$conf->setVal($key, $this->cleaned_data[$key]); $conf->setVal($key, $this->cleaned_data[$key]);
} }
if ($this->cleaned_data['template'] != '--') { if ($this->cleaned_data['template'] != '--') {
// Find the template project
$sql = new Pluf_SQL('shortname=%s',
array($this->cleaned_data['template']));
$tmpl = Pluf::factory('IDF_Project')->getOne(array('filter' => $sql->gen()));
$project->private = $tmpl->private;
$project->description = $tmpl->description;
$tmplconf = new IDF_Conf(); $tmplconf = new IDF_Conf();
$tmplconf->setProject($tmpl); $tmplconf->setProject($tmpl);
// We need to get all the configuration variables we want from // We need to get all the configuration variables we want from