oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-22 17:18:37 +00:00
Code Wiki Activity

form to upload file

Browse source
This commit is contained in:
Nicolas Lœuillet 2015-10-22 16:57:56 +02:00 • committed by Jeremy Benoist
parent 8c3c77c1bd
commit d275bdf4d3
7 changed files with 109 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Wallabag/CoreBundle/Command/ImportCommand.php
View file

@ -51,7 +51,7 @@ class ImportCommand extends ContainerAwareCommand
$batchSize = 20;
$i = 1;
$user = $em->getRepository('WallabagCoreBundle:User')
$user = $em->getRepository('WallabagUserBundle:User')
->findOneById($input->getArgument('userId'));
if (!is_object($user)) {
@ -116,6 +116,7 @@ class ImportCommand extends ContainerAwareCommand
protected function get(InputInterface $input, OutputInterface $output)
{
$filename = __DIR__.'/../../../../web/uploads/import/'.$input->getArgument('userId').'.json';
$data = $this->convert($filename);
return $data;