Indefero

Indefero Commit Details


Date:2011-04-06 06:07:19 (13 years 8 months ago)
Author:William MARTIN
Branch:master
Commit:f88e529b8513bc4ae951a2c38848ce40159e3334
Parents: f8b49c805a0cb6222af6acb0a28f8e44fad4831b
Message:Update the form validation of IDF_Form_ReviewFileComment. Now we can add a general comment without per file comment.

Fix issue 660
Changes:

File differences

src/IDF/Form/ReviewFileComment.php
5252
5353
5454
55
55
5656
5757
5858
......
9494
9595
9696
97
98
99
97
98
99
100
101
102
100103
101104
102
105
106
107
108
109
110
111
112
113
114
103115
104116
105117
106118
107119
108
109
120
121
122
123
124
125
110126
111
127
128
112129
113130
114
115131
116132
117133
));
}
$this->fields['content'] = new Pluf_Form_Field_Varchar(
array('required' => true,
array('required' => false,
'label' => __('General comment'),
'initial' => '',
'widget' => 'Pluf_Form_Widget_TextareaInput',
*/
public function clean()
{
foreach ($this->files as $filename => $def) {
if (!empty($this->cleaned_data[md5($filename)])) {
return $this->cleaned_data;
$isOk = false;
foreach($this->files as $filename => $def) {
$this->cleaned_data[md5($filename)] = trim($this->cleaned_data[md5($filename)]);
if(!empty($this->cleaned_data[md5($filename)])) {
$isOk = true;
}
}
throw new Pluf_Form_Invalid(__('You need to provide comments on at least one file.'));
if(!empty($this->cleaned_data['content'])) {
$isOk = true;
}
if (!$isOk) {
throw new Pluf_Form_Invalid(__('You need to provide your general comment about the proposal, or comments on at least one file.'));
}
return $this->cleaned_data;
}
function clean_content()
{
$content = trim($this->cleaned_data['content']);
if (!$this->show_full and strlen($content) == 0) {
throw new Pluf_Form_Invalid(__('You need to provide your general comment about the proposal.'));
if(empty($content)) {
if ($this->fields['status']->initial != $this->fields['status']->value) {
return __('The status have been updated.');
}
} else {
return $content;
}
return $content;
throw new Pluf_Form_Invalid(__('This field is required.'));
}
/**
* Save the model in the database.
*

Archive Download the corresponding diff file

Page rendered in 0.07828s using 14 queries.