aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2017-06-10 15:37:25 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2017-06-10 15:37:25 +0200
commita9c6577f0c51dd4282e022fa4b41cbb7b0e201b3 (patch)
treec50b4511d2855fe0e46aea9656ab9629b1fa8030 /src/Wallabag
parent1112e54772c9308ee3d7417869b5b8ef9b2b9812 (diff)
downloadwallabag-a9c6577f0c51dd4282e022fa4b41cbb7b0e201b3.tar.gz
wallabag-a9c6577f0c51dd4282e022fa4b41cbb7b0e201b3.tar.zst
wallabag-a9c6577f0c51dd4282e022fa4b41cbb7b0e201b3.zip
Few fixes
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/ApiBundle/Controller/EntryRestController.php4
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
index ae9a93aa..afd708e6 100644
--- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
@@ -680,10 +680,10 @@ class EntryRestController extends WallabagRestController
680 } 680 }
681 681
682 if (!is_null($isPublic)) { 682 if (!is_null($isPublic)) {
683 $entry->cleanUid();
684
685 if (true === (bool) $isPublic && null === $entry->getUid()) { 683 if (true === (bool) $isPublic && null === $entry->getUid()) {
686 $entry->generateUid(); 684 $entry->generateUid();
685 } else if (false === (bool) $isPublic) {
686 $entry->cleanUid();
687 } 687 }
688 } 688 }
689 689
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 07d41ed8..a0503c39 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -686,6 +686,7 @@ class Entry
686 686
687 /** 687 /**
688 * Used in the entries filter so it's more explicit for the end user than the uid. 688 * Used in the entries filter so it's more explicit for the end user than the uid.
689 * Also used in the API.
689 * 690 *
690 * @VirtualProperty 691 * @VirtualProperty
691 * @SerializedName("is_public") 692 * @SerializedName("is_public")
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index e9e75efa..e9e79c67 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -187,7 +187,7 @@ entry:
187 unread_label: "Non lus" 187 unread_label: "Non lus"
188 preview_picture_label: "A une photo" 188 preview_picture_label: "A une photo"
189 preview_picture_help: "Photo" 189 preview_picture_help: "Photo"
190 is_public_label: 'A une lien public' 190 is_public_label: 'A un lien public'
191 is_public_help: 'Lien public' 191 is_public_help: 'Lien public'
192 language_label: "Langue" 192 language_label: "Langue"
193 http_status_label: "Statut HTTP" 193 http_status_label: "Statut HTTP"