mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-22 14:48:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1207 from vpmalley/dev

Browse source 
issue #1203: fixing tag export
This commit is contained in:
Thomas Citharel 2015-06-06 17:02:55 +02:00
commit c56d1f21e3
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
inc/poche/Database.class.php
View file

@ -323,6 +323,21 @@ class Database {
return $entries; 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) public function retrieveOneById($id, $user_id)
{ {
$entry = NULL; $entry = NULL;

4
inc/poche/Poche.class.php
View file

@ -278,7 +278,7 @@ class Poche
} }
Tools::logm($msg); Tools::logm($msg);
} }
Tools::redirect('?'); Tools::redirect();
break; break;
case 'toggle_fav' : case 'toggle_fav' :
$this->store->favoriteById($id, $this->user->getId()); $this->store->favoriteById($id, $this->user->getId());
@ -896,7 +896,7 @@ class Poche
$filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json"; $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
header('Content-Disposition: attachment; filename='.$filename); 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( echo $this->tpl->render('export.twig', array(
'export' => Tools::renderJson($entries), 'export' => Tools::renderJson($entries),
)); ));