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

Merge branch 'develop' of projects.ceondo.com:indefero into develop

Browse Source
This commit is contained in:
Thomas Keller 2010-09-02 12:26:52 +00:00
commit 07b2b2f305
4 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,14 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
'help_text' => __('It must be unique for each project and composed only of letters, digits and dash (-) like "my-project".'), 'help_text' => __('It must be unique for each project and composed only of letters, digits and dash (-) like "my-project".'),
)); ));
$this->fields['shortdesc'] = new Pluf_Form_Field_Varchar(
array('required' => true,
'label' => __('short description'),
'help_text' => __('A one line description of the project.'),
'initial' => '',
'widget_attrs' => array('size' => '35'),
));
$this->fields['scm'] = new Pluf_Form_Field_Varchar( $this->fields['scm'] = new Pluf_Form_Field_Varchar(
array('required' => true, array('required' => true,
'label' => __('Repository type'), 'label' => __('Repository type'),
@ -272,6 +280,7 @@ 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'];
$project->shortdesc = $this->cleaned_data['shortdesc'];
if ($this->cleaned_data['template'] != '--') { if ($this->cleaned_data['template'] != '--') {
// Find the template project // Find the template project

9
src/IDF/Form/Admin/ProjectUpdate.php
View File

@ -43,6 +43,14 @@ class IDF_Form_Admin_ProjectUpdate extends Pluf_Form
'initial' => $this->project->name, 'initial' => $this->project->name,
)); ));
$this->fields['shortdesc'] = new Pluf_Form_Field_Varchar(
array('required' => true,
'label' => __('short description'),
'help_text' => __('A one line description of the project.'),
'initial' => $this->project->shortdesc,
'widget_attrs' => array('size' => '35'),
));
$this->fields['owners'] = new Pluf_Form_Field_Varchar( $this->fields['owners'] = new Pluf_Form_Field_Varchar(
array('required' => false, array('required' => false,
'label' => __('Project owners'), 'label' => __('Project owners'),
@ -80,6 +88,7 @@ class IDF_Form_Admin_ProjectUpdate extends Pluf_Form
$this->cleaned_data); $this->cleaned_data);
$this->project->membershipsUpdated(); $this->project->membershipsUpdated();
$this->project->name = $this->cleaned_data['name']; $this->project->name = $this->cleaned_data['name'];
$this->project->shortdesc = $this->cleaned_data['shortdesc'];
$this->project->update(); $this->project->update();
} }
} }

8
src/IDF/templates/idf/gadmin/projects/create.html
View File

@ -29,6 +29,14 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th><strong>{$form.f.shortdesc.labelTag}:</strong></th>
<td>
{if $form.f.shortdesc.errors}{$form.f.shortdesc.fieldErrors}{/if}
{$form.f.shortdesc|unsafe}<br />
<span class="helptext">{$form.f.shortdesc.help_text}</span>
</td>
</tr>
<tr>
<th><strong>{$form.f.scm.labelTag}:</strong></th> <th><strong>{$form.f.scm.labelTag}:</strong></th>
<td>{if $form.f.scm.errors}{$form.f.scm.fieldErrors}{/if} <td>{if $form.f.scm.errors}{$form.f.scm.fieldErrors}{/if}
{$form.f.scm|unsafe} {$form.f.scm|unsafe}

8
src/IDF/templates/idf/gadmin/projects/update.html
View File

@ -18,6 +18,14 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th><strong>{$form.f.shortdesc.labelTag}:</strong></th>
<td>
{if $form.f.shortdesc.errors}{$form.f.shortdesc.fieldErrors}{/if}
{$form.f.shortdesc|unsafe}<br />
<span class="helptext">{$form.f.shortdesc.help_text}</span>
</td>
</tr>
<tr>
<th><strong>{$form.f.owners.labelTag}:</strong></th> <th><strong>{$form.f.owners.labelTag}:</strong></th>
<td> <td>
{if $form.f.owners.errors}{$form.f.owners.fieldErrors}{/if} {if $form.f.owners.errors}{$form.f.owners.fieldErrors}{/if}