diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 4 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index d0cf91de..b01aaa7f 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -125,7 +125,7 @@ class ConfigController extends Controller | |||
125 | $newUser->setEnabled(true); | 125 | $newUser->setEnabled(true); |
126 | $newUserForm = $this->createForm(NewUserType::class, $newUser, array( | 126 | $newUserForm = $this->createForm(NewUserType::class, $newUser, array( |
127 | 'validation_groups' => array('Profile'), | 127 | 'validation_groups' => array('Profile'), |
128 | 'action' => $this->generateUrl('config').'#set5', | 128 | 'action' => $this->generateUrl('config').'#set6', |
129 | )); | 129 | )); |
130 | $newUserForm->handleRequest($request); | 130 | $newUserForm->handleRequest($request); |
131 | 131 | ||
@@ -198,7 +198,7 @@ class ConfigController extends Controller | |||
198 | * | 198 | * |
199 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 199 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
200 | */ | 200 | */ |
201 | public function deleteTaggingRule(TaggingRule $rule) | 201 | public function deleteTaggingRuleAction(TaggingRule $rule) |
202 | { | 202 | { |
203 | if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { | 203 | if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { |
204 | throw $this->createAccessDeniedException('You can not access this tagging ryle.'); | 204 | throw $this->createAccessDeniedException('You can not access this tagging ryle.'); |
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 9dd904f1..ea77d138 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -9,7 +9,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; | |||
9 | use Symfony\Component\HttpFoundation\Request; | 9 | use Symfony\Component\HttpFoundation\Request; |
10 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; | 10 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
11 | use Wallabag\CoreBundle\Entity\Entry; | 11 | use Wallabag\CoreBundle\Entity\Entry; |
12 | use Wallabag\CoreBundle\Filter\EntryFilterType; | 12 | use Wallabag\CoreBundle\Form\Type\EntryFilterType; |
13 | use Wallabag\CoreBundle\Form\Type\EditEntryType; | 13 | use Wallabag\CoreBundle\Form\Type\EditEntryType; |
14 | use Wallabag\CoreBundle\Form\Type\NewEntryType; | 14 | use Wallabag\CoreBundle\Form\Type\NewEntryType; |
15 | 15 | ||
@@ -54,10 +54,10 @@ class EntryController extends Controller | |||
54 | if (false !== $existingEntry) { | 54 | if (false !== $existingEntry) { |
55 | $this->get('session')->getFlashBag()->add( | 55 | $this->get('session')->getFlashBag()->add( |
56 | 'notice', | 56 | 'notice', |
57 | 'Entry already saved on '.$existingEntry['createdAt']->format('d-m-Y') | 57 | 'Entry already saved on '.$existingEntry->getCreatedAt()->format('d-m-Y') |
58 | ); | 58 | ); |
59 | 59 | ||
60 | return $this->redirect($this->generateUrl('view', array('id' => $existingEntry['id']))); | 60 | return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId()))); |
61 | } | 61 | } |
62 | 62 | ||
63 | $this->updateEntry($entry); | 63 | $this->updateEntry($entry); |
@@ -81,7 +81,7 @@ class EntryController extends Controller | |||
81 | * | 81 | * |
82 | * @return \Symfony\Component\HttpFoundation\Response | 82 | * @return \Symfony\Component\HttpFoundation\Response |
83 | */ | 83 | */ |
84 | public function addEntryViaBookmarklet(Request $request) | 84 | public function addEntryViaBookmarkletAction(Request $request) |
85 | { | 85 | { |
86 | $entry = new Entry($this->getUser()); | 86 | $entry = new Entry($this->getUser()); |
87 | $entry->setUrl($request->get('url')); | 87 | $entry->setUrl($request->get('url')); |