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

Merge pull request #664 from nlegoff/fix_1343

Browse Source 
[3.8] Fix #1343 Display default name if label is empty
This commit is contained in:
Romain Neutron
2013-10-01 02:48:09 -07:00
parent e63ae364ff 332579440a
commit 2651d16d20
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/databox/field.php
View File

@@ -497,7 +497,7 @@ class databox_field implements cache_cacheableInterface
throw new InvalidArgumentException(sprintf('Code %s is not defined', $code)); throw new InvalidArgumentException(sprintf('Code %s is not defined', $code));
} }
return isset($this->labels[$code]) ? $this->labels[$code] : $this->name; return isset($this->labels[$code]) && '' !== $this->labels[$code] ? $this->labels[$code] : $this->name;
} }
/** /**

3
tests/classes/databox/databox_fieldTest.php
View File

@@ -348,6 +348,9 @@ class databox_fieldTest extends PhraseanetPHPUnitAbstract
$this->object_mono->set_label($code, null)->save(); $this->object_mono->set_label($code, null)->save();
$this->assertEquals($this->object_mono->get_name(), $this->object_mono->get_label($code)); $this->assertEquals($this->object_mono->get_name(), $this->object_mono->get_label($code));
$this->object_mono->set_label($code, '')->save();
$this->assertEquals($this->object_mono->get_name(), $this->object_mono->get_label($code));
} }
public function provideLanguageCodes() public function provideLanguageCodes()