mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-25 18:41:05 +00:00
Code Issues Projects Releases Wiki Activity

Migrate controller and action references

Browse source
This commit is contained in:
Yassine Guedidi 2022-08-25 23:18:48 +02:00
parent 1c880883e2
commit 481283bbee
11 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/config/routing.yml
View file

@ -33,7 +33,7 @@ rest :
homepage:
path: "/{page}"
defaults:
_controller: WallabagCoreBundle:Entry:showUnread
_controller: 'Wallabag\CoreBundle\Controller\EntryController::showUnreadAction'
page : 1
requirements:
page: \d+
@ -47,7 +47,7 @@ fos_oauth_server_token:
craue_config_settings_modify:
path: /settings
defaults:
_controller: CraueConfigBundle:Settings:modify
_controller: 'Craue\ConfigBundle\Controller\SettingsController::modifyAction'
fos_js_routing:
resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"
@ -64,34 +64,34 @@ fos_js_routing:
rss_to_atom_unread:
path: /{username}/{token}/unread.xml
defaults:
_controller: FrameworkBundle:Redirect:redirect
_controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction'
route: unread_feed
permanent: true
rss_to_atom_archive:
path: /{username}/{token}/archive.xml
defaults:
_controller: FrameworkBundle:Redirect:redirect
_controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction'
route: archive_feed
permanent: true
rss_to_atom_starred:
path: /{username}/{token}/starred.xml
defaults:
_controller: FrameworkBundle:Redirect:redirect
_controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction'
route: starred_feed
permanent: true
rss_to_atom_all:
path: /{username}/{token}/all.xml
defaults:
_controller: FrameworkBundle:Redirect:redirect
_controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction'
route: all_feed
permanent: true
rss_to_atom_tags:
path: /{username}/{token}/tags/{slug}.xml
defaults:
_controller: FrameworkBundle:Redirect:redirect
_controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction'
route: tag_feed
permanent: true

2
src/Wallabag/AnnotationBundle/Resources/config/routing_annotations.yml
View file

@ -1,4 +1,4 @@
annotations:
type: rest
resource: "WallabagAnnotationBundle:WallabagAnnotation"
resource: 'Wallabag\AnnotationBundle\Controller\WallabagAnnotationController'
name_prefix: annotations_

8
src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
View file

@ -26,7 +26,7 @@ class AnnotationRestController extends WallabagRestController
{
$this->validateAuthentication();
return $this->forward('WallabagAnnotationBundle:WallabagAnnotation:getAnnotations', [
return $this->forward('Wallabag\AnnotationBundle\Controller\WallabagAnnotationController::getAnnotationsAction', [
'entry' => $entry,
]);
}
@ -48,7 +48,7 @@ class AnnotationRestController extends WallabagRestController
{
$this->validateAuthentication();
return $this->forward('WallabagAnnotationBundle:WallabagAnnotation:postAnnotation', [
return $this->forward('Wallabag\AnnotationBundle\Controller\WallabagAnnotationController::postAnnotationAction', [
'request' => $request,
'entry' => $entry,
]);
@ -71,7 +71,7 @@ class AnnotationRestController extends WallabagRestController
{
$this->validateAuthentication();
return $this->forward('WallabagAnnotationBundle:WallabagAnnotation:putAnnotation', [
return $this->forward('Wallabag\AnnotationBundle\Controller\WallabagAnnotationController::putAnnotationAction', [
'annotation' => $annotation,
'request' => $request,
]);
@ -94,7 +94,7 @@ class AnnotationRestController extends WallabagRestController
{
$this->validateAuthentication();
return $this->forward('WallabagAnnotationBundle:WallabagAnnotation:deleteAnnotation', [
return $this->forward('Wallabag\AnnotationBundle\Controller\WallabagAnnotationController::deleteAnnotationAction', [
'annotation' => $annotation,
]);
}

16
src/Wallabag/ApiBundle/Resources/config/routing_rest.yml
View file

@ -1,39 +1,39 @@
entry:
type: rest
resource: "WallabagApiBundle:EntryRest"
resource: 'Wallabag\ApiBundle\Controller\EntryRestController'
name_prefix: api_
search:
type: rest
resource: "WallabagApiBundle:SearchRest"
resource: 'Wallabag\ApiBundle\Controller\SearchRestController'
name_prefix: api_
tag:
type: rest
resource: "WallabagApiBundle:TagRest"
resource: 'Wallabag\ApiBundle\Controller\TagRestController'
name_prefix: api_
tagging_rule:
type: rest
resource: "WallabagApiBundle:TaggingRuleRest"
resource: 'Wallabag\ApiBundle\Controller\TaggingRuleRestController'
name_prefix: api_
annotation:
type: rest
resource: "WallabagApiBundle:AnnotationRest"
resource: 'Wallabag\ApiBundle\Controller\AnnotationRestController'
name_prefix: api_
misc:
type: rest
resource: "WallabagApiBundle:WallabagRest"
resource: 'Wallabag\ApiBundle\Controller\WallabagRestController'
name_prefix: api_
user:
type: rest
resource: "WallabagApiBundle:UserRest"
resource: 'Wallabag\ApiBundle\Controller\UserRestController'
name_prefix: api_
config:
type: rest
resource: "WallabagApiBundle:ConfigRest"
resource: 'Wallabag\ApiBundle\Controller\ConfigRestController'
name_prefix: api_

2
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
View file

@ -92,7 +92,7 @@
{% endfor %}
</div>
<div class="input-field baggy-add-tag" style="display: none">
{{ render(controller("WallabagCoreBundle:Tag:addTagForm", {'id': entry.id})) }}
{{ render(controller('Wallabag\\CoreBundle\\Controller\\TagController::addTagFormAction', {'id': entry.id})) }}
</div>
</aside>
</div>

2
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig
View file

@ -3,5 +3,5 @@
{% block title %}{{ 'entry.new.page_title'|trans }}{% endblock %}
{% block content %}
{{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
{{ render(controller('Wallabag\\CoreBundle\\Controller\\EntryController::addEntryFormAction')) }}
{% endblock %}

2
src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
View file

@ -35,7 +35,7 @@
<li class="menu new"><a href="{{ path('new') }}">{{ 'menu.left.save_link'|trans }}</a></li>
<li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a>
<div id="search-form" class="messages info popup-form">
{{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
{{ render(controller('Wallabag\\CoreBundle\\Controller\\EntryController::searchFormAction', {'currentRoute': app.request.attributes.get('_route')})) }}
</div>
</li>
{% if craue_setting('restricted_access') %}

2
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
View file

@ -297,7 +297,7 @@
</div>
<div class="input-field nav-panel-add-tag" style="display: none">
{{ render(controller("WallabagCoreBundle:Tag:addTagForm", {'id': entry.id})) }}
{{ render(controller('Wallabag\\CoreBundle\\Controller\\TagController::addTagFormAction', {'id': entry.id})) }}
</div>
</aside>

2
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig
View file

@ -3,5 +3,5 @@
{% block title %}{{ 'entry.new.page_title'|trans }}{% endblock %}
{% block content %}
{{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
{{ render(controller('Wallabag\\CoreBundle\\Controller\\EntryController::addEntryFormAction')) }}
{% endblock %}

4
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
View file

@ -154,8 +154,8 @@
</ul>
</div>
{{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': current_route})) }}
{{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
{{ render(controller('Wallabag\\CoreBundle\\Controller\\EntryController::searchFormAction', {'currentRoute': current_route})) }}
{{ render(controller('Wallabag\\CoreBundle\\Controller\\EntryController::addEntryFormAction')) }}
</div>
</nav>
{% endblock %}

2
src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
View file

@ -3,7 +3,7 @@
{% block title %}{{ 'import.page_title'|trans }}{% endblock %}
{% block messages %}
{{ render(controller("WallabagImportBundle:Import:checkQueue")) }}
{{ render(controller('Wallabag\\ImportBundle\\Controller\\ImportController::checkQueueAction')) }}
{{ parent() }}
{% endblock %}