mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-23 08:06:33 +00:00
Merge pull request #2547 from wallabag/add-option-markasread
Added a configuration to define the redirection after archiving an entry
This commit is contained in:
Jeremy Benoist
GitHub
commit
66336f6571
28 changed files with 335 additions and 39 deletions
|
|
@ -7,34 +7,38 @@ use Doctrine\DBAL\Schema\Schema;
|
|||
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
class Version20161031132655 extends AbstractMigration implements ContainerAwareInterface
|
||||
class Version20161106113822 extends AbstractMigration implements ContainerAwareInterface
|
||||
{
|
||||
/**
|
||||
* @var ContainerInterface
|
||||
*/
|
||||
private $container;
|
||||
|
||||
public function setContainer(ContainerInterface $container = null)
|
||||
{
|
||||
$this->container = $container;
|
||||
}
|
||||
|
||||
private function getTable($tableName)
|
||||
{
|
||||
return $this->container->getParameter('database_table_prefix') . $tableName;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$this->addSql("INSERT INTO \"".$this->getTable('craue_config_setting')."\" (name, value, section) VALUES ('share_unmark', 0, 'entry')");
|
||||
$this->addSql("INSERT INTO \"".$this->getTable('craue_config_setting')."\" (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')");
|
||||
$this->addSql('ALTER TABLE '.$this->getTable('config').' ADD action_mark_as_read INT DEFAULT 0');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql("DELETE FROM \"".$this->getTable('craue_config_setting')."\" WHERE name = 'share_unmark';");
|
||||
$this->addSql("DELETE FROM \"".$this->getTable('craue_config_setting')."\" WHERE name = 'unmark_url';");
|
||||
$this->abortIf($this->connection->getDatabasePlatform()->getName() != 'sqlite', 'This down migration can\'t be executed on SQLite databases, because SQLite don\'t support DROP COLUMN.');
|
||||
|
||||
$this->addSql('ALTER TABLE '.$this->getTable('config').' DROP action_mark_as_read');
|
||||
}
|
||||
}
|
||||
44
app/DoctrineMigrations/Version20161117071626.php
Normal file
44
app/DoctrineMigrations/Version20161117071626.php
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
<?php
|
||||
|
||||
namespace Application\Migrations;
|
||||
|
||||
use Doctrine\DBAL\Migrations\AbstractMigration;
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
class Version20161117071626 extends AbstractMigration implements ContainerAwareInterface
|
||||
{
|
||||
/**
|
||||
* @var ContainerInterface
|
||||
*/
|
||||
private $container;
|
||||
|
||||
public function setContainer(ContainerInterface $container = null)
|
||||
{
|
||||
$this->container = $container;
|
||||
}
|
||||
|
||||
private function getTable($tableName)
|
||||
{
|
||||
return $this->container->getParameter('database_table_prefix') . $tableName;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$this->addSql("INSERT INTO ".$this->getTable('craue_config_setting')." (name, value, section) VALUES ('share_unmark', 0, 'entry')");
|
||||
$this->addSql("INSERT INTO ".$this->getTable('craue_config_setting')." (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql("DELETE FROM ".$this->getTable('craue_config_setting')." WHERE name = 'share_unmark';");
|
||||
$this->addSql("DELETE FROM ".$this->getTable('craue_config_setting')." WHERE name = 'unmark_url';");
|
||||
}
|
||||
}
|
||||
|
|
@ -28,6 +28,14 @@ Lesegeschwindigkeit
|
|||
wallabag berechnet die Lesezeit für jeden Artikel. Du kannst hier definieren, dank dieser Liste, ob du
|
||||
ein schneller oder langsamer Leser bist. wallabag wird die Lesezeit für jeden Artikel neu berechnen.
|
||||
|
||||
Wohin möchtest du weitergeleitet werden, nach dem ein Artikel als gelesen markiert wurde?
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Jedes Mal, wenn du eine Aktion ausführst (nach dem Markieren eines Artikels als gelesen oder Favorit, nach dem Löschen eines Artikels oder dem Entfernen eines Tag von einem Eintrag), kannst du weitergeleitet werden:
|
||||
|
||||
- zur Homepage
|
||||
- zur aktuellen Seite
|
||||
|
||||
Sprache
|
||||
~~~~~~~
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,15 @@ Reading speed
|
|||
wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are
|
||||
a fast or a slow reader. wallabag will recalculate the reading time for each article.
|
||||
|
||||
Where do you want to be redirected after mark an article as read?
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Each time you'll do some actions (after marking an article as read/favorite,
|
||||
after deleting an article, after removing a tag from an entry), you can be redirected:
|
||||
|
||||
- To the homepage
|
||||
- To the current page
|
||||
|
||||
Language
|
||||
~~~~~~~~
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,15 @@ Vitesse de lecture
|
|||
|
||||
wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article.
|
||||
|
||||
Où souhaitez-vous être redirigé après avoir marqué un article comme lu ?
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Chaque fois que vous ferez certaines actions (après avoir marqué un article comme lu / comme favori,
|
||||
après avoir supprimé un article, après avoir retiré un tag d'un article), vous pouvez être redirigé :
|
||||
|
||||
- sur la page d'accueil
|
||||
- sur la page courante
|
||||
|
||||
Langue
|
||||
~~~~~~
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
|
|||
$adminConfig->setReadingSpeed(1);
|
||||
$adminConfig->setLanguage('en');
|
||||
$adminConfig->setPocketConsumerKey('xxxxx');
|
||||
$adminConfig->setActionMarkAsRead(0);
|
||||
|
||||
$manager->persist($adminConfig);
|
||||
|
||||
|
|
@ -32,6 +33,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
|
|||
$bobConfig->setReadingSpeed(1);
|
||||
$bobConfig->setLanguage('fr');
|
||||
$bobConfig->setPocketConsumerKey(null);
|
||||
$bobConfig->setActionMarkAsRead(1);
|
||||
|
||||
$manager->persist($bobConfig);
|
||||
|
||||
|
|
@ -43,6 +45,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
|
|||
$emptyConfig->setReadingSpeed(1);
|
||||
$emptyConfig->setLanguage('en');
|
||||
$emptyConfig->setPocketConsumerKey(null);
|
||||
$emptyConfig->setActionMarkAsRead(0);
|
||||
|
||||
$manager->persist($emptyConfig);
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,9 @@ use Wallabag\UserBundle\Entity\User;
|
|||
*/
|
||||
class Config
|
||||
{
|
||||
const REDIRECT_TO_HOMEPAGE = 0;
|
||||
const REDIRECT_TO_CURRENT_PAGE = 1;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*
|
||||
|
|
@ -87,6 +90,13 @@ class Config
|
|||
*/
|
||||
private $pocketConsumerKey;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*
|
||||
* @ORM\Column(name="action_mark_as_read", type="integer", nullable=true)
|
||||
*/
|
||||
private $actionMarkAsRead;
|
||||
|
||||
/**
|
||||
* @ORM\OneToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="config")
|
||||
*/
|
||||
|
|
@ -309,6 +319,26 @@ class Config
|
|||
return $this->pocketConsumerKey;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int
|
||||
*/
|
||||
public function getActionMarkAsRead()
|
||||
{
|
||||
return $this->actionMarkAsRead;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int $actionMarkAsRead
|
||||
*
|
||||
* @return Config
|
||||
*/
|
||||
public function setActionMarkAsRead($actionMarkAsRead)
|
||||
{
|
||||
$this->actionMarkAsRead = $actionMarkAsRead;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param TaggingRule $rule
|
||||
*
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
|||
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
use Wallabag\CoreBundle\Entity\Config;
|
||||
|
||||
class ConfigType extends AbstractType
|
||||
{
|
||||
|
|
@ -48,6 +49,13 @@ class ConfigType extends AbstractType
|
|||
'config.form_settings.reading_speed.400_word' => '2',
|
||||
],
|
||||
])
|
||||
->add('action_mark_as_read', ChoiceType::class, [
|
||||
'label' => 'config.form_settings.action_mark_as_read.label',
|
||||
'choices' => [
|
||||
'config.form_settings.action_mark_as_read.redirect_homepage' => Config::REDIRECT_TO_HOMEPAGE,
|
||||
'config.form_settings.action_mark_as_read.redirect_current_page' => Config::REDIRECT_TO_CURRENT_PAGE,
|
||||
],
|
||||
])
|
||||
->add('language', ChoiceType::class, [
|
||||
'choices' => array_flip($this->languages),
|
||||
'label' => 'config.form_settings.language_label',
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
namespace Wallabag\CoreBundle\Helper;
|
||||
|
||||
use Symfony\Component\Routing\Router;
|
||||
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
|
||||
use Wallabag\CoreBundle\Entity\Config;
|
||||
|
||||
/**
|
||||
* Manage redirections to avoid redirecting to empty routes.
|
||||
|
|
@ -10,10 +12,12 @@ use Symfony\Component\Routing\Router;
|
|||
class Redirect
|
||||
{
|
||||
private $router;
|
||||
private $tokenStorage;
|
||||
|
||||
public function __construct(Router $router)
|
||||
public function __construct(Router $router, TokenStorageInterface $tokenStorage)
|
||||
{
|
||||
$this->router = $router;
|
||||
$this->tokenStorage = $tokenStorage;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -24,6 +28,16 @@ class Redirect
|
|||
*/
|
||||
public function to($url, $fallback = '')
|
||||
{
|
||||
$user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
|
||||
|
||||
if (null === $user || !is_object($user)) {
|
||||
return $url;
|
||||
}
|
||||
|
||||
if (Config::REDIRECT_TO_HOMEPAGE === $user->getConfig()->getActionMarkAsRead()) {
|
||||
return $this->router->generate('homepage');
|
||||
}
|
||||
|
||||
if (null !== $url) {
|
||||
return $url;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,6 +109,7 @@ services:
|
|||
class: Wallabag\CoreBundle\Helper\Redirect
|
||||
arguments:
|
||||
- "@router"
|
||||
- "@security.token_storage"
|
||||
|
||||
wallabag_core.helper.prepare_pager_for_entries:
|
||||
class: Wallabag\CoreBundle\Helper\PreparePagerForEntries
|
||||
|
|
|
|||
|
|
@ -70,6 +70,10 @@ config:
|
|||
# 200_word: 'I read ~200 words per minute'
|
||||
# 300_word: 'I read ~300 words per minute'
|
||||
# 400_word: 'I read ~400 words per minute'
|
||||
action_mark_as_read:
|
||||
# label: 'Where do you to be redirected after mark an article as read?'
|
||||
# redirect_homepage: 'To the homepage'
|
||||
# redirect_current_page: 'To the current page'
|
||||
pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer
|
||||
# android_configuration: Configure your Android application
|
||||
form_rss:
|
||||
|
|
|
|||
|
|
@ -70,8 +70,12 @@ config:
|
|||
200_word: 'Ich lese ~200 Wörter pro Minute'
|
||||
300_word: 'Ich lese ~300 Wörter pro Minute'
|
||||
400_word: 'Ich lese ~400 Wörter pro Minute'
|
||||
action_mark_as_read:
|
||||
label: 'Wohin soll nach dem Gelesenmarkieren eines Artikels weitergeleitet werden?'
|
||||
redirect_homepage: 'Zur Homepage'
|
||||
redirect_current_page: 'Zur aktuellen Seite'
|
||||
pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren
|
||||
# android_configuration: Configure your Android application
|
||||
android_configuration: Konfiguriere deine Android Application
|
||||
form_rss:
|
||||
description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.'
|
||||
token_label: 'RSS-Token'
|
||||
|
|
@ -90,17 +94,17 @@ config:
|
|||
email_label: 'E-Mail-Adresse'
|
||||
twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung'
|
||||
delete:
|
||||
# title: Delete my account (a.k.a danger zone)
|
||||
# description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
|
||||
# confirm: Are you really sure? (THIS CAN'T BE UNDONE)
|
||||
# button: Delete my account
|
||||
title: Lösche mein Konto (a.k.a Gefahrenzone)
|
||||
description: Wenn du dein Konto löschst, werden ALL deine Artikel, ALL deine Tags, ALL deine Anmerkungen und dein Konto dauerhaft gelöscht (kann NICHT RÜCKGÄNGIG gemacht werden). Du wirst anschließend ausgeloggt.
|
||||
confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN)
|
||||
button: Lösche mein Konto
|
||||
reset:
|
||||
# title: Reset area (a.k.a danger zone)
|
||||
# description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
|
||||
# annotations: Remove ALL annotations
|
||||
# tags: Remove ALL tags
|
||||
# entries: Remove ALL entries
|
||||
# confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
|
||||
title: Zurücksetzen (a.k.a Gefahrenzone)
|
||||
description: Beim Nutzen der folgenden Schaltflächenhast du die Möglichkeit, einige Informationen von deinem Konto zu entfernen. Sei dir bewusst, dass dies NICHT RÜCKGÄNGIG zu machen ist.
|
||||
annotations: Entferne ALLE Annotationen
|
||||
tags: Entferne ALLE Tags
|
||||
entries: Entferne ALLE Einträge
|
||||
confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN)
|
||||
form_password:
|
||||
old_password_label: 'Altes Kennwort'
|
||||
new_password_label: 'Neues Kennwort'
|
||||
|
|
@ -371,7 +375,7 @@ import:
|
|||
how_to: 'Bitte wähle deinen Readability Export aus und klicke den unteren Button für das Hochladen und Importieren dessen.'
|
||||
worker:
|
||||
enabled: "Der Import erfolgt asynchron. Sobald der Import gestartet ist, wird diese Aufgabe extern abgearbeitet. Der aktuelle Service dafür ist:"
|
||||
# download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
|
||||
download_images_warning: "Du hast das Herunterladen von Bildern für deine Artikel aktiviert. Verbunden mit dem klassischen Import kann es ewig dauern fortzufahren (oder sogar fehlschlagen). Wir <strong>empfehlen</strong> den asynchronen Import zu aktivieren, um Fehler zu vermeiden."
|
||||
firefox:
|
||||
page_title: 'Aus Firefox importieren'
|
||||
description: "Dieser Import wird all deine Lesezeichen aus Firefox importieren. Gehe zu deinen Lesezeichen (Strg+Shift+O), dann auf \"Importen und Sichern\", wähle \"Sichern…\". Du erhälst eine .json Datei."
|
||||
|
|
@ -467,7 +471,7 @@ user:
|
|||
back_to_list: Zurück zur Liste
|
||||
|
||||
error:
|
||||
# page_title: An error occurred
|
||||
page_title: Ein Fehler ist aufgetreten
|
||||
|
||||
flashes:
|
||||
config:
|
||||
|
|
@ -480,9 +484,9 @@ flashes:
|
|||
tagging_rules_updated: 'Tagging-Regeln aktualisiert'
|
||||
tagging_rules_deleted: 'Tagging-Regel gelöscht'
|
||||
rss_token_updated: 'RSS-Token aktualisiert'
|
||||
# annotations_reset: Annotations reset
|
||||
# tags_reset: Tags reset
|
||||
# entries_reset: Entries reset
|
||||
annotations_reset: Anmerkungen zurücksetzen
|
||||
tags_reset: Tags zurücksetzen
|
||||
entries_reset: Einträge zurücksetzen
|
||||
entry:
|
||||
notice:
|
||||
entry_already_saved: 'Eintrag bereits am %date% gespeichert'
|
||||
|
|
@ -514,6 +518,6 @@ flashes:
|
|||
client_deleted: 'Client gelöscht'
|
||||
user:
|
||||
notice:
|
||||
# added: 'User "%username%" added'
|
||||
# updated: 'User "%username%" updated'
|
||||
# deleted: 'User "%username%" deleted'
|
||||
added: 'Benutzer "%username%" hinzugefügt'
|
||||
updated: 'Benutzer "%username%" aktualisiert'
|
||||
deleted: 'Benutzer "%username%" gelöscht'
|
||||
|
|
|
|||
|
|
@ -70,6 +70,10 @@ config:
|
|||
200_word: 'I read ~200 words per minute'
|
||||
300_word: 'I read ~300 words per minute'
|
||||
400_word: 'I read ~400 words per minute'
|
||||
action_mark_as_read:
|
||||
label: 'Where do you want to be redirected after mark an article as read?'
|
||||
redirect_homepage: 'To the homepage'
|
||||
redirect_current_page: 'To the current page'
|
||||
pocket_consumer_key_label: Consumer key for Pocket to import contents
|
||||
android_configuration: Configure your Android application
|
||||
form_rss:
|
||||
|
|
@ -96,11 +100,11 @@ config:
|
|||
button: Delete my account
|
||||
reset:
|
||||
title: Reset area (a.k.a danger zone)
|
||||
description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
|
||||
description: By hitting buttons below you'll have ability to remove some information from your account. Be aware that these actions are IRREVERSIBLE.
|
||||
annotations: Remove ALL annotations
|
||||
tags: Remove ALL tags
|
||||
entries: Remove ALL entries
|
||||
confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
|
||||
confirm: Are you really sure? (THIS CAN'T BE UNDONE)
|
||||
form_password:
|
||||
old_password_label: 'Current password'
|
||||
new_password_label: 'New password'
|
||||
|
|
|
|||
|
|
@ -70,6 +70,10 @@ config:
|
|||
200_word: 'Leo ~200 palabras por minuto'
|
||||
300_word: 'Leo ~300 palabras por minuto'
|
||||
400_word: 'Leo ~400 palabras por minuto'
|
||||
action_mark_as_read:
|
||||
# label: 'Where do you to be redirected after mark an article as read?'
|
||||
# redirect_homepage: 'To the homepage'
|
||||
# redirect_current_page: 'To the current page'
|
||||
# pocket_consumer_key_label: Consumer key for Pocket to import contents
|
||||
# android_configuration: Configure your Android application
|
||||
form_rss:
|
||||
|
|
|
|||
|
|
@ -70,6 +70,10 @@ config:
|
|||
200_word: 'من تقریباً ۲۰۰ واژه را در دقیقه میخوانم'
|
||||
300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه میخوانم'
|
||||
400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه میخوانم'
|
||||
action_mark_as_read:
|
||||
# label: 'Where do you to be redirected after mark an article as read?'
|
||||
# redirect_homepage: 'To the homepage'
|
||||
# redirect_current_page: 'To the current page'
|
||||
pocket_consumer_key_label: کلید کاربری Pocket برای درونریزی مطالب
|
||||
# android_configuration: Configure your Android application
|
||||
form_rss:
|
||||
|
|
|
|||
|
|
@ -70,6 +70,10 @@ config:
|
|||
200_word: "Je lis environ 200 mots par minute"
|
||||
300_word: "Je lis environ 300 mots par minute"
|
||||
400_word: "Je lis environ 400 mots par minute"
|
||||
action_mark_as_read:
|
||||
label: 'Où souhaitez-vous être redirigé après avoir marqué un article comme lu ?'
|
||||
redirect_homepage: "À la page d'accueil"
|
||||
redirect_current_page: 'À la page courante'
|
||||
pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données
|
||||
android_configuration: Configurez votre application Android
|
||||
form_rss:
|
||||
|
|
|
|||
|
|
@ -70,6 +70,10 @@ config:
|
|||
200_word: 'Leggo ~200 parole al minuto'
|
||||
300_word: 'Leggo ~300 parole al minuto'
|
||||
400_word: 'Leggo ~400 parole al minuto'
|
||||
action_mark_as_read:
|
||||
# label: 'Where do you to be redirected after mark an article as read?'
|
||||
# redirect_homepage: 'To the homepage'
|
||||
# redirect_current_page: 'To the current page'
|
||||
pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti
|
||||
# android_configuration: Configure your Android application
|
||||
form_rss:
|
||||
|
|
|
|||
|
|
@ -70,6 +70,10 @@ config:
|
|||
200_word: "Legissi a l'entorn de 200 mots per minuta"
|
||||
300_word: "Legissi a l'entorn de 300 mots per minuta"
|
||||
400_word: "Legissi a l'entorn de 400 mots per minuta"
|
||||
action_mark_as_read:
|
||||
# label: 'Where do you to be redirected after mark an article as read?'
|
||||
# redirect_homepage: 'To the homepage'
|
||||
# redirect_current_page: 'To the current page'
|
||||
pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas
|
||||
android_configuration: Configuratz vòstra aplicacion Android
|
||||
form_rss:
|
||||
|
|
|
|||
|
|
@ -70,6 +70,10 @@ config:
|
|||
200_word: 'Czytam ~200 słów na minutę'
|
||||
300_word: 'Czytam ~300 słów na minutę'
|
||||
400_word: 'Czytam ~400 słów na minutę'
|
||||
action_mark_as_read:
|
||||
# label: 'Where do you to be redirected after mark an article as read?'
|
||||
# redirect_homepage: 'To the homepage'
|
||||
# redirect_current_page: 'To the current page'
|
||||
pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości'
|
||||
android_configuration: Skonfiguruj swoją androidową aplikację
|
||||
form_rss:
|
||||
|
|
|
|||
|
|
@ -70,6 +70,10 @@ config:
|
|||
200_word: 'Posso ler ~200 palavras por minuto'
|
||||
300_word: 'Posso ler ~300 palavras por minuto'
|
||||
400_word: 'Posso ler ~400 palavras por minuto'
|
||||
action_mark_as_read:
|
||||
# label: 'Where do you to be redirected after mark an article as read?'
|
||||
# redirect_homepage: 'To the homepage'
|
||||
# redirect_current_page: 'To the current page'
|
||||
pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo'
|
||||
# android_configuration: Configure your Android application
|
||||
form_rss:
|
||||
|
|
|
|||
|
|
@ -70,6 +70,10 @@ config:
|
|||
# 200_word: 'I read ~200 words per minute'
|
||||
# 300_word: 'I read ~300 words per minute'
|
||||
# 400_word: 'I read ~400 words per minute'
|
||||
action_mark_as_read:
|
||||
# label: 'Where do you to be redirected after mark an article as read?'
|
||||
# redirect_homepage: 'To the homepage'
|
||||
# redirect_current_page: 'To the current page'
|
||||
pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket
|
||||
# android_configuration: Configure your Android application
|
||||
form_rss:
|
||||
|
|
|
|||
|
|
@ -70,6 +70,10 @@ config:
|
|||
# 200_word: 'I read ~200 words per minute'
|
||||
# 300_word: 'I read ~300 words per minute'
|
||||
# 400_word: 'I read ~400 words per minute'
|
||||
action_mark_as_read:
|
||||
# label: 'Where do you to be redirected after mark an article as read?'
|
||||
# redirect_homepage: 'To the homepage'
|
||||
# redirect_current_page: 'To the current page'
|
||||
# pocket_consumer_key_label: Consumer key for Pocket to import contents
|
||||
# android_configuration: Configure your Android application
|
||||
form_rss:
|
||||
|
|
|
|||
|
|
@ -36,6 +36,14 @@
|
|||
</div>
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="w500p inline">
|
||||
<div class="row">
|
||||
{{ form_label(form.config.action_mark_as_read) }}
|
||||
{{ form_errors(form.config.action_mark_as_read) }}
|
||||
{{ form_widget(form.config.action_mark_as_read) }}
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="w500p inline">
|
||||
<div class="row">
|
||||
{{ form_label(form.config.language) }}
|
||||
|
|
|
|||
|
|
@ -51,6 +51,14 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="input-field col s12">
|
||||
{{ form_label(form.config.action_mark_as_read) }}
|
||||
{{ form_errors(form.config.action_mark_as_read) }}
|
||||
{{ form_widget(form.config.action_mark_as_read) }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="input-field col s12">
|
||||
{{ form_label(form.config.language) }}
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
|
|||
'config[theme]' => 'baggy',
|
||||
'config[items_per_page]' => '30',
|
||||
'config[reading_speed]' => '0.5',
|
||||
'config[action_mark_as_read]' => '0',
|
||||
'config[language]' => 'en',
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
namespace Tests\Wallabag\CoreBundle\Controller;
|
||||
|
||||
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
|
||||
use Wallabag\CoreBundle\Entity\Config;
|
||||
use Wallabag\CoreBundle\Entity\Entry;
|
||||
|
||||
class EntryControllerTest extends WallabagCoreTestCase
|
||||
|
|
@ -896,4 +897,68 @@ class EntryControllerTest extends WallabagCoreTestCase
|
|||
|
||||
$client->getContainer()->get('craue_config')->set('download_images_enabled', 0);
|
||||
}
|
||||
|
||||
public function testRedirectToHomepage()
|
||||
{
|
||||
$this->logInAs('empty');
|
||||
$client = $this->getClient();
|
||||
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->find($this->getLoggedInUserId());
|
||||
|
||||
if (!$user) {
|
||||
$this->markTestSkipped('No user found in db.');
|
||||
}
|
||||
|
||||
// Redirect to homepage
|
||||
$config = $user->getConfig();
|
||||
$config->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
|
||||
$em->persist($config);
|
||||
$em->flush();
|
||||
|
||||
$content = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
|
||||
|
||||
$client->request('GET', '/view/'.$content->getId());
|
||||
$client->request('GET', '/archive/'.$content->getId());
|
||||
|
||||
$this->assertEquals(302, $client->getResponse()->getStatusCode());
|
||||
$this->assertEquals('/', $client->getResponse()->headers->get('location'));
|
||||
}
|
||||
|
||||
public function testRedirectToCurrentPage()
|
||||
{
|
||||
$this->logInAs('empty');
|
||||
$client = $this->getClient();
|
||||
|
||||
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||
$user = $em
|
||||
->getRepository('WallabagUserBundle:User')
|
||||
->find($this->getLoggedInUserId());
|
||||
|
||||
if (!$user) {
|
||||
$this->markTestSkipped('No user found in db.');
|
||||
}
|
||||
|
||||
// Redirect to current page
|
||||
$config = $user->getConfig();
|
||||
$config->setActionMarkAsRead(Config::REDIRECT_TO_CURRENT_PAGE);
|
||||
$em->persist($config);
|
||||
$em->flush();
|
||||
|
||||
$content = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
|
||||
|
||||
$client->request('GET', '/view/'.$content->getId());
|
||||
$client->request('GET', '/archive/'.$content->getId());
|
||||
|
||||
$this->assertEquals(302, $client->getResponse()->getStatusCode());
|
||||
$this->assertContains('/view/'.$content->getId(), $client->getResponse()->headers->get('location'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
namespace Tests\Wallabag\CoreBundle\Helper;
|
||||
|
||||
use Wallabag\CoreBundle\Helper\DownloadImages;
|
||||
use Psr\Log\NullLogger;
|
||||
use Monolog\Logger;
|
||||
use Monolog\Handler\TestHandler;
|
||||
use GuzzleHttp\Client;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,11 @@
|
|||
|
||||
namespace Tests\Wallabag\CoreBundle\Helper;
|
||||
|
||||
use Wallabag\CoreBundle\Entity\Config;
|
||||
use Wallabag\UserBundle\Entity\User;
|
||||
use Wallabag\CoreBundle\Helper\Redirect;
|
||||
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
|
||||
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
|
||||
|
||||
class RedirectTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
|
|
@ -14,8 +18,38 @@ class RedirectTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
public function setUp()
|
||||
{
|
||||
$this->routerMock = $this->getRouterMock();
|
||||
$this->redirect = new Redirect($this->routerMock);
|
||||
$this->routerMock = $this->getMockBuilder('Symfony\Component\Routing\Router')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
|
||||
$this->routerMock->expects($this->any())
|
||||
->method('generate')
|
||||
->with('homepage')
|
||||
->willReturn('homepage');
|
||||
|
||||
$user = new User();
|
||||
$user->setName('youpi');
|
||||
$user->setEmail('youpi@youpi.org');
|
||||
$user->setUsername('youpi');
|
||||
$user->setPlainPassword('youpi');
|
||||
$user->setEnabled(true);
|
||||
$user->addRole('ROLE_SUPER_ADMIN');
|
||||
|
||||
$config = new Config($user);
|
||||
$config->setTheme('material');
|
||||
$config->setItemsPerPage(30);
|
||||
$config->setReadingSpeed(1);
|
||||
$config->setLanguage('en');
|
||||
$config->setPocketConsumerKey('xxxxx');
|
||||
$config->setActionMarkAsRead(Config::REDIRECT_TO_CURRENT_PAGE);
|
||||
|
||||
$user->setConfig($config);
|
||||
|
||||
$this->token = new UsernamePasswordToken($user, 'password', 'key');
|
||||
$tokenStorage = new TokenStorage();
|
||||
$tokenStorage->setToken($this->token);
|
||||
|
||||
$this->redirect = new Redirect($this->routerMock, $tokenStorage);
|
||||
}
|
||||
|
||||
public function testRedirectToNullWithFallback()
|
||||
|
|
@ -39,17 +73,20 @@ class RedirectTest extends \PHPUnit_Framework_TestCase
|
|||
$this->assertEquals('/unread/list', $redirectUrl);
|
||||
}
|
||||
|
||||
private function getRouterMock()
|
||||
public function testWithNotLoggedUser()
|
||||
{
|
||||
$mock = $this->getMockBuilder('Symfony\Component\Routing\Router')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$redirect = new Redirect($this->routerMock, new TokenStorage());
|
||||
$redirectUrl = $redirect->to('/unread/list');
|
||||
|
||||
$mock->expects($this->any())
|
||||
->method('generate')
|
||||
->with('homepage')
|
||||
->willReturn('homepage');
|
||||
$this->assertEquals('/unread/list', $redirectUrl);
|
||||
}
|
||||
|
||||
return $mock;
|
||||
public function testUserForRedirectToHomepage()
|
||||
{
|
||||
$this->token->getUser()->getConfig()->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
|
||||
|
||||
$redirectUrl = $this->redirect->to('/unread/list');
|
||||
|
||||
$this->assertEquals($this->routerMock->generate('homepage'), $redirectUrl);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue