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

Issue 584: Ability to add a due date to a ticket - beginnings thereof

Browse Source
This commit is contained in:
Simon Holywell 2012-03-04 22:57:26 +00:00
parent 9bd5912884
commit f697d97b6a
5 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/IDF/Form/IssueCreate.php
View File

@ -112,6 +112,12 @@ class IDF_Form_IssueCreate extends Pluf_Form
'size' => 15,
),
));
$this->fields['due_dtime'] = new Pluf_Form_Field_Datetime(
array('required' => false,
'label' => __('Due Date'),
'initial' => '',
'widget_attrs' => array('size' => 15,),
));
$this->fields['relation_type0'] = new Pluf_Form_Field_Varchar(
array('required' => false,
@ -368,6 +374,7 @@ class IDF_Form_IssueCreate extends Pluf_Form
$issue->status = new IDF_Tag($_t[0]); // first one is the default
$issue->owner = null;
}
$issue->due_dtime = $this->cleaned_data['due_dtime'];
$issue->summary = trim($this->cleaned_data['summary']);
$issue->create();
foreach ($tags as $tag) {

11
src/IDF/Form/IssueUpdate.php
View File

@ -103,6 +103,12 @@ class IDF_Form_IssueUpdate extends IDF_Form_IssueCreate
'size' => 15,
),
));
$this->fields['due_dtime'] = new Pluf_Form_Field_Datetime(
array('required' => false,
'label' => __('Due Date'),
'initial' => $this->issue->due_dtime,
'widget_attrs' => array('size' => 15,),
));
$idx = 0;
// note: clean_relation_type0 and clean_relation_issue0 already
@ -385,6 +391,10 @@ class IDF_Form_IssueUpdate extends IDF_Form_IssueCreate
or ((!is_null($owner) and !is_null($this->issue->get_owner())) and $owner->id != $this->issue->get_owner()->id)) {
$changes['ow'] = (is_null($owner)) ? '---' : $owner->login;
}
$due_dtime = $this->cleaned_data['due_dtime'];
if (trim($this->issue->due_dtime) != trim($this->cleaned_data['due_dtime'])) {
$changes['du'] = trim($this->cleaned_data['due_dtime']);
}
// Issue relations - additions
foreach ($this->cleaned_data['_added_issue_relations'] as $verb => $ids) {
$other_verb = $this->relation_types[$verb];
@ -431,6 +441,7 @@ class IDF_Form_IssueUpdate extends IDF_Form_IssueCreate
$this->issue->summary = trim($this->cleaned_data['summary']);
$this->issue->status = $status;
$this->issue->owner = $owner;
$this->issue->due_dtime = $due_dtime;
}
// Create the comment
$comment = new IDF_IssueComment();

6
src/IDF/Issue.php
View File

@ -91,6 +91,12 @@ class IDF_Issue extends Pluf_Model
'model' => 'IDF_Tag',
'verbose' => __('labels'),
),
'due_dtime' =>
array(
'type' => 'Pluf_DB_Field_Datetime',
'blank' => true,
'verbose' => __('due date'),
),
'status' =>
array(
'type' => 'Pluf_DB_Field_Foreignkey',

5
src/IDF/templates/idf/issues/create.html
View File

@ -63,6 +63,11 @@
</td>
</tr>
<tr>
<th>{$form.f.due_dtime.labelTag}:</th>
<td>{if $form.f.due_dtime.errors}{$form.f.due_dtime.fieldErrors}{/if}
{$form.f.due_dtime|unsafe}
</td>
<tr>
<th>{$form.f.relation_type0.labelTag}:</th>
<td>
{if $form.f.relation_type0.errors}{$form.f.relation_type0.fieldErrors}{/if}

5
src/IDF/templates/idf/issues/view.html
View File

@ -128,6 +128,11 @@
{$form.f.owner|unsafe}
</td>
</tr>
<th>{$form.f.due_dtime.labelTag}:</th>
<td>{if $form.f.due_dtime.errors}{$form.f.due_dtime.fieldErrors}{/if}
{$form.f.due_dtime|unsafe}
</td>
<tr>
<tr>
<th>{$form.f.relation_type0.labelTag}:</th>
<td>