Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds pagerfanta paginator everywhere, modifies article routing. #1250

Merged
merged 1 commit into from
Jul 29, 2015
Merged

Adds pagerfanta paginator everywhere, modifies article routing. #1250

merged 1 commit into from
Jul 29, 2015

Conversation

fgravelaine
Copy link

Adds pagerfanta paginator everywhere, and modifies article routing.
Change API for is_starred and is_archived. (Reflects the output of the API 'getEntries')

@@ -13,77 +13,66 @@ class EntryRepository extends EntityRepository
* Retrieves unread entries for a user.
*
* @param int $userId
* @param int $firstResult
* @param int $maxResults
*
* @return Paginator
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you adjust the docblock for every function? It now returns a DoctrineORMAdapter.
Also, you can remove the use Doctrine\ORM\Tools\Pagination\Paginator;

@j0k3r
Copy link
Member

j0k3r commented Jul 28, 2015

Sadly test are failing but it seems to be unrelated to your change.
Can you take some time to see why they are failing? Thanks :)

@j0k3r j0k3r added this to the 2.0 milestone Jul 28, 2015
@fgravelaine
Copy link
Author

@j0k3r Ok, I'll check tests today.

@fgravelaine
Copy link
Author

It was related to my changes.
Pagination adds some conflicts between routes.
(archive/1 for page 1 and archive/1 for "add entry 1 to archive")

I modified routing :

  • archive/list/3 loads 3rd page of archived entries
  • archive/3 toggle archive flag on entry with id 3

Let me know if you want me to change routing.

@j0k3r
Copy link
Member

j0k3r commented Jul 29, 2015

Great thanks @frankoa 👍

j0k3r added a commit that referenced this pull request Jul 29, 2015
Adds pagerfanta paginator everywhere, modifies article routing.
@j0k3r j0k3r merged commit 7e63b89 into wallabag:v2 Jul 29, 2015
@nicosomb nicosomb modified the milestones: 2.0, 2.0.0-alpha Aug 12, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants