mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-09-26 21:40:16 +00:00
Code Issues Projects Releases Wiki Activity

Add migration

Browse source
This commit is contained in:
Nicolas Lœuillet 2016-04-10 21:48:11 +02:00
parent f3d0cb9106
commit d0545b6bd6
6 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/DoctrineMigrations/Version20160410190541.php Normal file
View file

@ -0,0 +1,26 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;
class Version20160410190541 extends AbstractMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->addSql('ALTER TABLE wallabag_entry ADD uuid LONGTEXT DEFAULT NULL');
$this->addSql('UPDATE wallabag_entry SET uuid = uuid()');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('ALTER TABLE `wallabag_entry` DROP uuid');
}
}

5
src/Wallabag/CoreBundle/Command/InstallCommand.php
View file

@ -241,6 +241,11 @@ class InstallCommand extends ContainerAwareCommand
$em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute();
$settings = [
[
'name' => 'share_public',
'value' => '1',
'section' => 'entry',
],
[
'name' => 'carrot',
'value' => '1',

5
src/Wallabag/CoreBundle/Controller/EntryController.php
View file

@ -451,10 +451,9 @@ class EntryController extends Controller
private function checkIfEntryAlreadyExists(Entry $entry)
{
return $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
}
/*
/**
* Share entry content.
*
* @param Entry $entry
@ -463,7 +462,7 @@ class EntryController extends Controller
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function shareEntry(Entry $entry)
public function shareEntryAction(Entry $entry)
{
return $this->render(
'@WallabagCore/themes/share.html.twig',

5
src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
View file

@ -15,6 +15,11 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
public function load(ObjectManager $manager)
{
$settings = [
[
'name' => 'share_public',
'value' => '1',
'section' => 'entry',
],
[
'name' => 'carrot',
'value' => '1',

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

@ -17,6 +17,9 @@
<li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
<li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
<li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
{% if craue_setting('share_public') %}
<li><a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="public"><span>public</span></a></li>
{% endif %}
{% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %}
{% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %}
{% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}

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

@ -99,7 +99,7 @@
</a>
<div class="collapsible-body">
<ul>
{% if craue_setting('share_twitter') %}
{% if craue_setting('share_public') %}
<li>
<a href="{{ path('share', {'uuid': entry.uuid }) }}" target="_blank" class="tool public" title="public">
<span>public</span>