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

Add possibility to restrict aggregated feeds to a set of feeds

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-03-20 18:19:55 +01:00
parent 6d79e44c9a
commit 8638bfb3d4
12 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1480,14 +1480,14 @@ class API_V1_adapter extends API_V1_Abstract
{
$result = new API_V1_result($this->app, $request, $this);
$coll = Feed_Collection::load_all($this->app, $user);
$coll = Feed_Collection::load($this->app, $user);
$datas = array();
$data = array();
foreach ($coll->get_feeds() as $feed) {
$datas[] = $this->list_publication($feed, $user);
$data[] = $this->list_publication($feed, $user);
}
$result->set_datas(array("feeds" => $datas));
$result->set_datas(array("feeds" => $data));
return $result;
}
@@ -1536,21 +1536,21 @@ class API_V1_adapter extends API_V1_Abstract
{
$result = new API_V1_result($this->app, $request, $this);
$feed = Feed_Aggregate::load_with_user($this->app, $user);
$restrictions = (array) ($request->get('feeds') ? : array());
$feed = Feed_Aggregate::load_with_user($this->app, $user, $restrictions);
$offset_start = (int) ($request->get('offset_start') ? : 0);
$per_page = (int) ($request->get('per_page') ? : 5);
$per_page = (($per_page >= 1) && ($per_page <= 20)) ? $per_page : 5;
$datas = array(
$result->set_datas(array(
'total_entries' => $feed->get_count_total_entries(),
'offset_start' => $offset_start,
'per_page' => $per_page,
'entries' => $this->list_publications_entries($feed, $offset_start, $per_page),
);
$result->set_datas($datas);
));
return $result;
}