mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-22 15:46:30 +00:00
Change share entry behavior
This commit is contained in:
Nicolas Lœuillet
parent
3377c938f8
commit
f1be7af446
17 changed files with 81 additions and 23 deletions
|
|
@ -28,18 +28,6 @@ class Version20160410190541 extends AbstractMigration implements ContainerAwareI
|
|||
$this->addSql('ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL');
|
||||
}
|
||||
|
||||
public function postUp(Schema $schema)
|
||||
{
|
||||
$em = $this->container->get('doctrine.orm.entity_manager');
|
||||
$repository = $em->getRepository('WallabagCoreBundle:Entry');
|
||||
$entries = $repository->findAll();
|
||||
|
||||
/** @var Entry $entry */
|
||||
foreach ($entries as $entry) {
|
||||
$this->addSql('UPDATE `wallabag_entry` SET `uuid` = "'.uniqid('', true).'" WHERE id = '.$entry->getId());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -292,8 +292,6 @@ class EntryController extends Controller
|
|||
{
|
||||
$this->checkUserAction($entry);
|
||||
|
||||
$this->generateEntryUuid($entry);
|
||||
|
||||
return $this->render(
|
||||
'WallabagCoreBundle:Entry:entry.html.twig',
|
||||
['entry' => $entry]
|
||||
|
|
@ -437,7 +435,7 @@ class EntryController extends Controller
|
|||
*/
|
||||
private function checkUserAction(Entry $entry)
|
||||
{
|
||||
if ($this->getUser()->getId() != $entry->getUser()->getId()) {
|
||||
if (null === $this->getUser() || $this->getUser()->getId() != $entry->getUser()->getId()) {
|
||||
throw $this->createAccessDeniedException('You can not access this entry.');
|
||||
}
|
||||
}
|
||||
|
|
@ -454,12 +452,57 @@ class EntryController extends Controller
|
|||
return $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
*/
|
||||
public function shareAction(Entry $entry)
|
||||
{
|
||||
$this->checkUserAction($entry);
|
||||
|
||||
if ('' === $entry->getUuid() || null === $entry->getUuid()) {
|
||||
$this->generateEntryUuid($entry);
|
||||
}
|
||||
|
||||
return $this->redirect($this->generateUrl('share_entry', [
|
||||
'uuid' => $entry->getUuid(),
|
||||
]));
|
||||
}
|
||||
|
||||
/**
|
||||
* Disable public sharing for an entry.
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @Route("/share/delete/{id}", requirements={"id" = "\d+"}, name="delete_share")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
public function deleteShareAction(Entry $entry)
|
||||
{
|
||||
$this->checkUserAction($entry);
|
||||
|
||||
$entry->cleanUuid();
|
||||
$em = $this->getDoctrine()->getManager();
|
||||
$em->persist($entry);
|
||||
$em->flush();
|
||||
|
||||
return $this->redirect($this->generateUrl('view', [
|
||||
'id' => $entry->getId(),
|
||||
]));
|
||||
}
|
||||
|
||||
/**
|
||||
* Share entry content.
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @Route("/share/{uuid}", requirements={"uuid" = ".+"}, name="share")
|
||||
* @Route("/share/{uuid}", requirements={"uuid" = ".+"}, name="share_entry")
|
||||
* @Cache(maxage="25200", public=true)
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
|
|
|||
|
|
@ -436,8 +436,6 @@ class Entry
|
|||
}
|
||||
|
||||
$this->updatedAt = new \DateTime();
|
||||
|
||||
$this->generateUuid();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -634,4 +632,9 @@ class Entry
|
|||
$this->uuid = uniqid('', true);
|
||||
}
|
||||
}
|
||||
|
||||
public function cleanUuid()
|
||||
{
|
||||
$this->uuid = null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ entry:
|
|||
share_content: 'Deling'
|
||||
# share_email_label: 'Email'
|
||||
# public_link: 'public link'
|
||||
# delete_public_link: 'delete public link'
|
||||
download: 'Download'
|
||||
# print: 'Print'
|
||||
problem:
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ entry:
|
|||
share_content: 'Teilen'
|
||||
share_email_label: 'E-Mail'
|
||||
# public_link: 'public link'
|
||||
# delete_public_link: 'delete public link'
|
||||
download: 'Herunterladen'
|
||||
print: 'Drucken'
|
||||
problem:
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ entry:
|
|||
share_content: 'Share'
|
||||
share_email_label: 'Email'
|
||||
public_link: 'public link'
|
||||
delete_public_link: 'delete public link'
|
||||
download: 'Download'
|
||||
print: 'Print'
|
||||
problem:
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ entry:
|
|||
share_content: 'Compartir'
|
||||
share_email_label: 'Dirección e-mail'
|
||||
# public_link: 'public link'
|
||||
# delete_public_link: 'delete public link'
|
||||
download: 'Descargar'
|
||||
print: 'Imprimir'
|
||||
problem:
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ entry:
|
|||
share_content: 'همرسانی'
|
||||
share_email_label: 'نشانی ایمیل'
|
||||
# public_link: 'public link'
|
||||
# delete_public_link: 'delete public link'
|
||||
download: 'بارگیری'
|
||||
print: 'چاپ'
|
||||
problem:
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ entry:
|
|||
share_content: 'Partager'
|
||||
share_email_label: 'Email'
|
||||
public_link: 'Lien public'
|
||||
delete_public_link: 'Supprimer lien public'
|
||||
download: 'Télécharger'
|
||||
print: 'Imprimer'
|
||||
problem:
|
||||
|
|
|
|||
|
|
@ -185,6 +185,8 @@ entry:
|
|||
add_a_tag: 'Aggiungi un tag'
|
||||
share_content: 'Condividi'
|
||||
share_email_label: 'E-mail'
|
||||
# public_link: 'public link'
|
||||
# delete_public_link: 'delete public link'
|
||||
download: 'Download'
|
||||
print: 'Stampa'
|
||||
problem:
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ entry:
|
|||
share_content: 'Partatjar'
|
||||
share_email_label: 'Corrièl'
|
||||
# public_link: 'public link'
|
||||
# delete_public_link: 'delete public link'
|
||||
download: 'Telecargar'
|
||||
print: 'Imprimir'
|
||||
problem:
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ entry:
|
|||
share_content: 'Udostępnij'
|
||||
share_email_label: 'Adres email'
|
||||
# public_link: 'public link'
|
||||
# delete_public_link: 'delete public link'
|
||||
download: 'Pobierz'
|
||||
print: 'Drukuj'
|
||||
problem:
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ entry:
|
|||
share_content: 'Dă mai departe'
|
||||
share_email_label: 'E-mail'
|
||||
# public_link: 'public link'
|
||||
# delete_public_link: 'delete public link'
|
||||
download: 'Descarcă'
|
||||
# print: 'Print'
|
||||
problem:
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ entry:
|
|||
share_content: 'Paylaş'
|
||||
share_email_label: 'E-posta'
|
||||
# public_link: 'public link'
|
||||
# delete_public_link: 'delete public link'
|
||||
download: 'İndir'
|
||||
# print: 'Print'
|
||||
problem:
|
||||
|
|
|
|||
|
|
@ -101,10 +101,15 @@
|
|||
<ul>
|
||||
{% if craue_setting('share_public') %}
|
||||
<li>
|
||||
<a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}">
|
||||
<a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool public" title="{{ 'entry.view.left_menu.public_link'|trans }}">
|
||||
<span>{{ 'entry.view.left_menu.public_link'|trans }}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool public" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}">
|
||||
<span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if craue_setting('share_twitter') %}
|
||||
<li>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ class InstallCommandTest extends WallabagCoreTestCase
|
|||
}
|
||||
|
||||
/**
|
||||
* Ensure next tests will have a clean database
|
||||
* Ensure next tests will have a clean database.
|
||||
*/
|
||||
public static function tearDownAfterClass()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -681,10 +681,17 @@ class SymfonyRequirements extends RequirementCollection
|
|||
|
||||
if (class_exists('Symfony\Component\Intl\Intl')) {
|
||||
$this->addRecommendation(
|
||||
\Symfony\Component\Intl\Intl::getIcuDataVersion() === \Symfony\Component\Intl\Intl::getIcuVersion(),
|
||||
sprintf('intl ICU version installed on your system (%s) should match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()),
|
||||
'In most cases you should be fine, but please verify there is no inconsistencies between data provided by Symfony and the intl extension. See https://github.com/symfony/symfony/issues/15007 for an example of inconsistencies you might run into.'
|
||||
\Symfony\Component\Intl\Intl::getIcuDataVersion() <= \Symfony\Component\Intl\Intl::getIcuVersion(),
|
||||
sprintf('intl ICU version installed on your system is outdated (%s) and does not match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()),
|
||||
'To get the latest internationalization data upgrade the ICU system package and the intl PHP extension.'
|
||||
);
|
||||
if (\Symfony\Component\Intl\Intl::getIcuDataVersion() <= \Symfony\Component\Intl\Intl::getIcuVersion()) {
|
||||
$this->addRecommendation(
|
||||
\Symfony\Component\Intl\Intl::getIcuDataVersion() === \Symfony\Component\Intl\Intl::getIcuVersion(),
|
||||
sprintf('intl ICU version installed on your system (%s) does not match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()),
|
||||
'To avoid internationalization data incosistencies upgrade the symfony/intl component.'
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
$this->addPhpIniRecommendation(
|
||||
|
|
|
|||
Loading…
Reference in a new issue