Merge pull request #4150 from ldidry/fix-3804

💄 Add untagged list link to filter menu

diff --combined src/Wallabag/CoreBundle/Controller/EntryController.php
index cd9e8d27452e05b58401a06c00a8b90d19d80a4e,85144a5ccace8fcde1a08817e8abca764ff6049e..ba5bfbe2916540ca7f2564d2f06891b6acd96ead
--- 1/src/Wallabag/CoreBundle/Controller/EntryController.php
--- 2/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@@ -21,7 -21,8 +21,7 @@@ use Wallabag\CoreBundle\Form\Type\Searc
  class EntryController extends Controller
  {
      /**
 -     * @param Request $request
 -     * @param int     $page
 +     * @param int $page
       *
       * @Route("/search/{page}", name="search", defaults={"page" = 1})
       *
@@@ -52,6 -53,8 +52,6 @@@
      }
  
      /**
 -     * @param Request $request
 -     *
       * @Route("/new-entry", name="new_entry")
       *
       * @return \Symfony\Component\HttpFoundation\Response
@@@ -94,6 -97,8 +94,6 @@@
      }
  
      /**
 -     * @param Request $request
 -     *
       * @Route("/bookmarklet", name="bookmarklet")
       *
       * @return \Symfony\Component\HttpFoundation\Response
@@@ -130,6 -135,9 +130,6 @@@
      /**
       * Edit an entry content.
       *
 -     * @param Request $request
 -     * @param Entry   $entry
 -     *
       * @Route("/edit/{id}", requirements={"id" = "\d+"}, name="edit")
       *
       * @return \Symfony\Component\HttpFoundation\Response
@@@ -163,7 -171,8 +163,7 @@@
      /**
       * Shows all entries for current user.
       *
 -     * @param Request $request
 -     * @param int     $page
 +     * @param int $page
       *
       * @Route("/all/list/{page}", name="all", defaults={"page" = "1"})
       *
@@@ -177,7 -186,8 +177,7 @@@
      /**
       * Shows unread entries for current user.
       *
 -     * @param Request $request
 -     * @param int     $page
 +     * @param int $page
       *
       * @Route("/unread/list/{page}", name="unread", defaults={"page" = "1"})
       *
@@@ -196,7 -206,8 +196,7 @@@
      /**
       * Shows read entries for current user.
       *
 -     * @param Request $request
 -     * @param int     $page
 +     * @param int $page
       *
       * @Route("/archive/list/{page}", name="archive", defaults={"page" = "1"})
       *
@@@ -210,7 -221,8 +210,7 @@@
      /**
       * Shows starred entries for current user.
       *
 -     * @param Request $request
 -     * @param int     $page
 +     * @param int $page
       *
       * @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"})
       *
@@@ -224,7 -236,8 +224,7 @@@
      /**
       * Shows untagged articles for current user.
       *
 -     * @param Request $request
 -     * @param int     $page
 +     * @param int $page
       *
       * @Route("/untagged/list/{page}", name="untagged", defaults={"page" = "1"})
       *
@@@ -263,6 -276,8 +263,6 @@@
      /**
       * Shows entry content.
       *
 -     * @param Entry $entry
 -     *
       * @Route("/view/{id}", requirements={"id" = "\d+"}, name="view")
       *
       * @return \Symfony\Component\HttpFoundation\Response
@@@ -281,6 -296,8 +281,6 @@@
       * Reload an entry.
       * Refetch content from the website and make it readable again.
       *
 -     * @param Entry $entry
 -     *
       * @Route("/reload/{id}", requirements={"id" = "\d+"}, name="reload_entry")
       *
       * @return \Symfony\Component\HttpFoundation\RedirectResponse
@@@ -313,6 -330,9 +313,6 @@@
      /**
       * Changes read status for an entry.
       *
 -     * @param Request $request
 -     * @param Entry   $entry
 -     *
       * @Route("/archive/{id}", requirements={"id" = "\d+"}, name="archive_entry")
       *
       * @return \Symfony\Component\HttpFoundation\RedirectResponse
@@@ -342,6 -362,9 +342,6 @@@
      /**
       * Changes starred status for an entry.
       *
 -     * @param Request $request
 -     * @param Entry   $entry
 -     *
       * @Route("/star/{id}", requirements={"id" = "\d+"}, name="star_entry")
       *
       * @return \Symfony\Component\HttpFoundation\RedirectResponse
@@@ -372,6 -395,8 +372,6 @@@
      /**
       * Deletes entry and redirect to the homepage or the last viewed page.
       *
 -     * @param Entry $entry
 -     *
       * @Route("/delete/{id}", requirements={"id" = "\d+"}, name="delete_entry")
       *
       * @return \Symfony\Component\HttpFoundation\RedirectResponse
@@@ -412,6 -437,8 +412,6 @@@
      /**
       * Get public URL for entry (and generate it if necessary).
       *
 -     * @param Entry $entry
 -     *
       * @Route("/share/{id}", requirements={"id" = "\d+"}, name="share")
       *
       * @return \Symfony\Component\HttpFoundation\Response
@@@ -436,6 -463,8 +436,6 @@@
      /**
       * Disable public sharing for an entry.
       *
 -     * @param Entry $entry
 -     *
       * @Route("/share/delete/{id}", requirements={"id" = "\d+"}, name="delete_share")
       *
       * @return \Symfony\Component\HttpFoundation\Response
@@@ -458,6 -487,8 +458,6 @@@
      /**
       * Ability to view a content publicly.
       *
 -     * @param Entry $entry
 -     *
       * @Route("/share/{uid}", requirements={"uid" = ".+"}, name="share_entry")
       * @Cache(maxage="25200", smaxage="25200", public=true)
       *
@@@ -479,8 -510,9 +479,8 @@@
       * Global method to retrieve entries depending on the given type
       * It returns the response to be send.
       *
 -     * @param string  $type    Entries type: unread, starred or archive
 -     * @param Request $request
 -     * @param int     $page
 +     * @param string $type Entries type: unread, starred or archive
 +     * @param int    $page
       *
       * @return \Symfony\Component\HttpFoundation\Response
       */
@@@ -535,6 -567,9 +535,9 @@@
              }
          }
  
+         $nbEntriesUntagged = $this->get('wallabag_core.entry_repository')
+             ->countUntaggedEntriesByUser($this->getUser()->getId());
+ 
          return $this->render(
              'WallabagCoreBundle:Entry:entries.html.twig', [
                  'form' => $form->createView(),
@@@ -542,6 -577,7 +545,7 @@@
                  'currentPage' => $page,
                  'searchTerm' => $searchTerm,
                  'isFiltered' => $form->isSubmitted(),
+                 'nbEntriesUntagged' => $nbEntriesUntagged,
              ]
          );
      }
@@@ -550,6 -586,7 +554,6 @@@
       * Fetch content and update entry.
       * In case it fails, $entry->getContent will return an error message.
       *
 -     * @param Entry  $entry
       * @param string $prefixMessage Should be the translation key: entry_saved or entry_reloaded
       */
      private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved')
@@@ -580,6 -617,8 +584,6 @@@
  
      /**
       * Check if the logged user can manage the given entry.
 -     *
 -     * @param Entry $entry
       */
      private function checkUserAction(Entry $entry)
      {
@@@ -591,6 -630,8 +595,6 @@@
      /**
       * Check for existing entry, if it exists, redirect to it with a message.
       *
 -     * @param Entry $entry
 -     *
       * @return Entry|bool
       */
      private function checkIfEntryAlreadyExists(Entry $entry)