diff options
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php | 3 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php index 23f21c3e..3af53805 100644 --- a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php +++ b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php | |||
@@ -124,9 +124,10 @@ class AnnotationRepository extends EntityRepository | |||
124 | } | 124 | } |
125 | 125 | ||
126 | /** | 126 | /** |
127 | * Find all annotations related to archived entries | 127 | * Find all annotations related to archived entries. |
128 | * | 128 | * |
129 | * @param $userId | 129 | * @param $userId |
130 | * | ||
130 | * @return mixed | 131 | * @return mixed |
131 | */ | 132 | */ |
132 | public function findAllByArchivedEntriesAndUserId($userId) | 133 | public function findAllByArchivedEntriesAndUserId($userId) |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 3548f590..01f63a7b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -200,6 +200,11 @@ | |||
200 | </a> | 200 | </a> |
201 | </li> | 201 | </li> |
202 | <li> | 202 | <li> |
203 | <a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
204 | {{ 'config.reset.archived'|trans }} | ||
205 | </a> | ||
206 | </li> | ||
207 | <li> | ||
203 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | 208 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> |
204 | {{ 'config.reset.entries'|trans }} | 209 | {{ 'config.reset.entries'|trans }} |
205 | </a> | 210 | </a> |