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

Merge pull request #393 from romainneutron/collection-labels-api

Browse Source 
[3.8] Add collection labels to api
This commit is contained in:
Romain Neutron
2013-06-14 00:44:51 -07:00
parent 07d4ff7d45 d2a50f31b0
commit a7c4739797
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/classes/API/V1/adapter.php
View File

@@ -2026,7 +2026,13 @@ class API_V1_adapter extends API_V1_Abstract
$ret = array( $ret = array(
'base_id' => $collection->get_base_id(), 'base_id' => $collection->get_base_id(),
'collection_id' => $collection->get_coll_id(), 'collection_id' => $collection->get_coll_id(),
'name' => $collection->get_label($this->app['locale.I18n']), 'name' => $collection->get_name(),
'labels' => array(
'fr' => $collection->get_label('fr'),
'en' => $collection->get_label('en'),
'de' => $collection->get_label('de'),
'nl' => $collection->get_label('nl'),
),
'record_amount' => $collection->get_record_amount(), 'record_amount' => $collection->get_record_amount(),
); );

5
tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
View File

@@ -637,6 +637,11 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
$this->assertArrayHasKey('base_id', $collection); $this->assertArrayHasKey('base_id', $collection);
$this->assertArrayHasKey('collection_id', $collection); $this->assertArrayHasKey('collection_id', $collection);
$this->assertArrayHasKey('name', $collection); $this->assertArrayHasKey('name', $collection);
$this->assertArrayHasKey('labels', $collection);
$this->assertArrayHasKey('fr', $collection['labels']);
$this->assertArrayHasKey('en', $collection['labels']);
$this->assertArrayHasKey('de', $collection['labels']);
$this->assertArrayHasKey('nl', $collection['labels']);
$this->assertArrayHasKey('record_amount', $collection); $this->assertArrayHasKey('record_amount', $collection);
$this->assertTrue(is_int($collection['base_id'])); $this->assertTrue(is_int($collection['base_id']));
$this->assertGreaterThan(0, $collection['base_id']); $this->assertGreaterThan(0, $collection['base_id']);