Indefero Commit Details

Date:

2010-09-02 07:16:41 (15 years 3 months ago)

Author:

Loïc d'Anterroches

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

439014b0b134e3d44636968a4bb8bf031d27df7b

Parents:

f6fc5ae46668aabda69964ba5625de788fdf77c9

Message:

Fixed ticket 479, project editing inconsistency.

Changes:

File differences

-64
65 65
66 66
67
68
69
70
71
72
73
74
67 75
68 76
69 77
... ...
272 280
273 281
274 282
283
275 284
276 285
277 286
+                                            '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(␊
                    array('required' => true,␊
                          'label' => __('Repository type'),␊

        $project = new IDF_Project();␊
        $project->name = $this->cleaned_data['name'];␊
        $project->shortname = $this->cleaned_data['shortname'];␊
        $project->shortdesc = $this->cleaned_data['shortdesc'];␊
␊
        if ($this->cleaned_data['template'] != '--') {␊
            // Find the template 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(␊
                     array('required' => true,␊
                           'label' => __('Repository type'),␊
         $project = new IDF_Project();␊
         $project->name = $this->cleaned_data['name'];␊
         $project->shortname = $this->cleaned_data['shortname'];␊
+        $project->shortdesc = $this->cleaned_data['shortdesc'];␊
 ␊
         if ($this->cleaned_data['template'] != '--') {␊
             // Find the template project␊

-43
44 44
45 45
46
47
48
49
50
51
52
53
46 54
47 55
48 56
... ...
80 88
81 89
82 90
91
83 92
84 93
85 94
+                                            '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(␊
                                      array('required' => false,␊
                                            'label' => __('Project owners'),␊

                                                $this->cleaned_data);␊
        $this->project->membershipsUpdated();␊
        $this->project->name = $this->cleaned_data['name'];␊
        $this->project->shortdesc = $this->cleaned_data['shortdesc'];␊
        $this->project->update();␊
    }␊
}␊
 ...
                                             '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(␊
                                       array('required' => false,␊
                                             'label' => __('Project owners'),␊
                                                 $this->cleaned_data);␊
         $this->project->membershipsUpdated();␊
         $this->project->name = $this->cleaned_data['name'];␊
+        $this->project->shortdesc = $this->cleaned_data['shortdesc'];␊
         $this->project->update();␊
     }␊
 }␊

-29
30 30
31 31
32
33
34
35
36
37
38
39
32 40
33 41
34 42
+</td>␊
</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>␊
<td>{if $form.f.scm.errors}{$form.f.scm.fieldErrors}{/if}␊
{$form.f.scm|unsafe}␊
 </td>␊
 </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>␊
 <td>{if $form.f.scm.errors}{$form.f.scm.fieldErrors}{/if}␊
 {$form.f.scm|unsafe}␊

-18
19 19
20 20
21
22
23
24
25
26
27
28
21 29
22 30
23 31
+</td>␊
</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>␊
<td>␊
{if $form.f.owners.errors}{$form.f.owners.fieldErrors}{/if}␊
 </td>␊
 </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>␊
 <td>␊
 {if $form.f.owners.errors}{$form.f.owners.fieldErrors}{/if}␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags