mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-01 06:39:18 +00:00
[1203] fixing tag export
This commit is contained in:
parent
727c35d809
commit
f9c8087f78
2 changed files with 16 additions and 1 deletions
|
@ -323,6 +323,21 @@ class Database {
|
|||
return $entries;
|
||||
}
|
||||
|
||||
public function retrieveAllWithTags($user_id)
|
||||
{
|
||||
$entries = $this->retrieveAll($user_id);
|
||||
$count = count($entries);
|
||||
for ($i = 0; $i < $count; $i++) {
|
||||
$tag_entries = $this->retrieveTagsByEntry($entries[$i]['id']);
|
||||
$tags = [];
|
||||
foreach ($tag_entries as $tag) {
|
||||
$tags[] = $tag[1];
|
||||
}
|
||||
$entries[$i]['tags'] = implode(',', $tags);
|
||||
}
|
||||
return $entries;
|
||||
}
|
||||
|
||||
public function retrieveOneById($id, $user_id)
|
||||
{
|
||||
$entry = NULL;
|
||||
|
|
|
@ -874,7 +874,7 @@ class Poche
|
|||
$filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
|
||||
header('Content-Disposition: attachment; filename='.$filename);
|
||||
|
||||
$entries = $this->store->retrieveAll($this->user->getId());
|
||||
$entries = $this->store->retrieveAllWithTags($this->user->getId());
|
||||
echo $this->tpl->render('export.twig', array(
|
||||
'export' => Tools::renderJson($entries),
|
||||
));
|
||||
|
|
Loading…
Reference in a new issue