hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-19 07:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor caption_field

Browse Source
This commit is contained in:
Romain Neutron
2012-01-18 18:43:01 +01:00
parent 813a5ccde8
commit e7fddf7177
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/unitTest/record/adapterTest.php
View File

@@ -384,7 +384,13 @@ class record_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
if ($meta_el->is_multi()) if ($meta_el->is_multi())
{ {
$this->assertEquals($multi_imploded, implode(' ' . $meta_el->get_separator() . ' ', $field->get_value(false))); $initial_values = array();
foreach($field->get_values() as $value)
{
$initial_values[] = $value->getValue();
}
$this->assertEquals($multi_imploded, implode(' ' . $meta_el->get_separator() . ' ', $initial_values));
$this->assertEquals($multi_imploded, $field->get_serialized_values()); $this->assertEquals($multi_imploded, $field->get_serialized_values());
} }
else else

2
templates/web/prod/actions/Bridge/Dailymotion/upload.twig
View File

@@ -66,7 +66,7 @@
</div> </div>
</td> </td>
<td> <td>
<input class='required_field' type='text' name='{{name}}' value="{{ caption.get_dc_field('Subject') is not none ? caption.get_dc_field('Subject').get_value(true, ' ') : ''}}"/> <input class='required_field' type='text' name='{{name}}' value="{{ caption.get_dc_field('Subject') is not none ? caption.get_dc_field('Subject').get_serialized_values(' ') : ''}}"/>
<br /> <br />
{{ error_form.display_errors(name, constraint_errors) }} {{ error_form.display_errors(name, constraint_errors) }}
</td> </td>

2
templates/web/prod/actions/Bridge/Flickr/upload.twig
View File

@@ -74,7 +74,7 @@
<label for='{{ name }}'>{% trans 'Tags' %}</label> <label for='{{ name }}'>{% trans 'Tags' %}</label>
</td> </td>
<td> <td>
<input class='required_field' type='text' style="width:150px;" name='{{ name }}' value="{{ caption.get_dc_field('Subject') is not none ? caption.get_dc_field('Subject').get_value(true, ' ') : '' }}"/> <input class='required_field' type='text' style="width:150px;" name='{{ name }}' value="{{ caption.get_dc_field('Subject') is not none ? caption.get_dc_field('Subject').get_serialized_values(' ') : '' }}"/>
<br /> <br />
{{ error_form.display_errors(name, constraint_errors) }} {{ error_form.display_errors(name, constraint_errors) }}
</td> </td>

2
templates/web/prod/actions/Bridge/Youtube/upload.twig
View File

@@ -78,7 +78,7 @@
</div> </div>
</td> </td>
<td> <td>
<input class='required_field' type='text' name='{{ name }}' value="{{ caption.get_dc_field('Subject') is not none ? caption.get_dc_field('Subject').get_value(true, ' ') : ""}}"/> <input class='required_field' type='text' name='{{ name }}' value="{{ caption.get_dc_field('Subject') is not none ? caption.get_dc_field('Subject').get_serialized_values(' ') : ""}}"/>
<br /> <br />
{{ error_form.display_errors(name, constraint_errors) }} {{ error_form.display_errors(name, constraint_errors) }}
</td> </td>