aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-04-14 14:56:26 +0200
committerGitHub <noreply@github.com>2017-04-14 14:56:26 +0200
commit531828ca44604b85c3053e202e991809a4701f3b (patch)
tree80756e0bb5bf9f85f115e1eb6a26547ca7be2a1a /src
parent3e7a843aa998442148061347e7978722b8cd87d2 (diff)
parent01736b5a2ee2a48403a2462014886bf009f18786 (diff)
downloadwallabag-531828ca44604b85c3053e202e991809a4701f3b.tar.gz
wallabag-531828ca44604b85c3053e202e991809a4701f3b.tar.zst
wallabag-531828ca44604b85c3053e202e991809a4701f3b.zip
Merge pull request #3030 from wallabag/remove-isPublic-from-entry
Remove isPublic from Entry entity fix #2598
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php25
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/EditEntryType.php5
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig5
15 files changed, 0 insertions, 47 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 7276b437..bbb1fb53 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -175,15 +175,6 @@ class Entry
175 private $previewPicture; 175 private $previewPicture;
176 176
177 /** 177 /**
178 * @var bool
179 *
180 * @ORM\Column(name="is_public", type="boolean", nullable=true, options={"default" = false})
181 *
182 * @Groups({"export_all"})
183 */
184 private $isPublic;
185
186 /**
187 * @var string 178 * @var string
188 * 179 *
189 * @ORM\Column(name="http_status", type="string", length=3, nullable=true) 180 * @ORM\Column(name="http_status", type="string", length=3, nullable=true)
@@ -532,22 +523,6 @@ class Entry
532 } 523 }
533 524
534 /** 525 /**
535 * @return bool
536 */
537 public function isPublic()
538 {
539 return $this->isPublic;
540 }
541
542 /**
543 * @param bool $isPublic
544 */
545 public function setIsPublic($isPublic)
546 {
547 $this->isPublic = $isPublic;
548 }
549
550 /**
551 * @return ArrayCollection<Tag> 526 * @return ArrayCollection<Tag>
552 */ 527 */
553 public function getTags() 528 public function getTags()
diff --git a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
index 40e5b5b9..1627cc44 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
@@ -3,7 +3,6 @@
3namespace Wallabag\CoreBundle\Form\Type; 3namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
7use Symfony\Component\Form\Extension\Core\Type\SubmitType; 6use Symfony\Component\Form\Extension\Core\Type\SubmitType;
8use Symfony\Component\Form\Extension\Core\Type\TextType; 7use Symfony\Component\Form\Extension\Core\Type\TextType;
9use Symfony\Component\Form\FormBuilderInterface; 8use Symfony\Component\Form\FormBuilderInterface;
@@ -18,10 +17,6 @@ class EditEntryType extends AbstractType
18 'required' => true, 17 'required' => true,
19 'label' => 'entry.edit.title_label', 18 'label' => 'entry.edit.title_label',
20 ]) 19 ])
21 ->add('is_public', CheckboxType::class, [
22 'required' => false,
23 'label' => 'entry.edit.is_public_label',
24 ])
25 ->add('url', TextType::class, [ 20 ->add('url', TextType::class, [
26 'disabled' => true, 21 'disabled' => true,
27 'required' => false, 22 'required' => false,
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index dfac7a65..ff89a6d1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -235,7 +235,6 @@ entry:
235 # page_title: 'Edit an entry' 235 # page_title: 'Edit an entry'
236 # title_label: 'Title' 236 # title_label: 'Title'
237 url_label: 'Url' 237 url_label: 'Url'
238 # is_public_label: 'Public'
239 save_label: 'Gem' 238 save_label: 'Gem'
240 public: 239 public:
241 # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>" 240 # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 0b9df325..99b15b0d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -235,7 +235,6 @@ entry:
235 page_title: 'Eintrag bearbeiten' 235 page_title: 'Eintrag bearbeiten'
236 title_label: 'Titel' 236 title_label: 'Titel'
237 url_label: 'URL' 237 url_label: 'URL'
238 is_public_label: 'Öffentlich'
239 save_label: 'Speichern' 238 save_label: 'Speichern'
240 public: 239 public:
241 shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt" 240 shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 2fa3192e..273ba25d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -235,7 +235,6 @@ entry:
235 page_title: 'Edit an entry' 235 page_title: 'Edit an entry'
236 title_label: 'Title' 236 title_label: 'Title'
237 url_label: 'Url' 237 url_label: 'Url'
238 is_public_label: 'Public'
239 save_label: 'Save' 238 save_label: 'Save'
240 public: 239 public:
241 shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 240 shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index ce581d89..87c6954f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -235,7 +235,6 @@ entry:
235 page_title: 'Editar un artículo' 235 page_title: 'Editar un artículo'
236 title_label: 'Título' 236 title_label: 'Título'
237 url_label: 'URL' 237 url_label: 'URL'
238 is_public_label: 'Es público'
239 save_label: 'Guardar' 238 save_label: 'Guardar'
240 public: 239 public:
241 shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>" 240 shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 3e3ee12c..caafd6d7 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -235,7 +235,6 @@ entry:
235 page_title: 'ویرایش مقاله' 235 page_title: 'ویرایش مقاله'
236 title_label: 'عنوان' 236 title_label: 'عنوان'
237 url_label: 'نشانی' 237 url_label: 'نشانی'
238 is_public_label: 'عمومی'
239 save_label: 'ذخیره' 238 save_label: 'ذخیره'
240 public: 239 public:
241 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 240 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 074593a6..72366513 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -235,7 +235,6 @@ entry:
235 page_title: "Éditer un article" 235 page_title: "Éditer un article"
236 title_label: "Titre" 236 title_label: "Titre"
237 url_label: "Adresse" 237 url_label: "Adresse"
238 is_public_label: "Public"
239 save_label: "Enregistrer" 238 save_label: "Enregistrer"
240 public: 239 public:
241 shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>" 240 shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 0d86756a..52f05b87 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -235,7 +235,6 @@ entry:
235 page_title: 'Modifica voce' 235 page_title: 'Modifica voce'
236 title_label: 'Titolo' 236 title_label: 'Titolo'
237 url_label: 'Url' 237 url_label: 'Url'
238 is_public_label: 'Pubblico'
239 save_label: 'Salva' 238 save_label: 'Salva'
240 public: 239 public:
241 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 240 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index d2949c50..c8b0e783 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -235,7 +235,6 @@ entry:
235 page_title: 'Modificar un article' 235 page_title: 'Modificar un article'
236 title_label: 'Títol' 236 title_label: 'Títol'
237 url_label: 'Url' 237 url_label: 'Url'
238 is_public_label: 'Public'
239 save_label: 'Enregistrar' 238 save_label: 'Enregistrar'
240 public: 239 public:
241 shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" 240 shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 1f512942..e586ea84 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -235,7 +235,6 @@ entry:
235 page_title: 'Edytuj wpis' 235 page_title: 'Edytuj wpis'
236 title_label: 'Tytuł' 236 title_label: 'Tytuł'
237 url_label: 'Adres URL' 237 url_label: 'Adres URL'
238 is_public_label: 'Publiczny'
239 save_label: 'Zapisz' 238 save_label: 'Zapisz'
240 public: 239 public:
241 shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>" 240 shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 2e815230..09ddd7f8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -235,7 +235,6 @@ entry:
235 page_title: 'Editar uma entrada' 235 page_title: 'Editar uma entrada'
236 title_label: 'Título' 236 title_label: 'Título'
237 url_label: 'Url' 237 url_label: 'Url'
238 is_public_label: 'Público'
239 save_label: 'Salvar' 238 save_label: 'Salvar'
240 public: 239 public:
241 shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>" 240 shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 16401efd..cdd0be9f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -235,7 +235,6 @@ entry:
235 # page_title: 'Edit an entry' 235 # page_title: 'Edit an entry'
236 # title_label: 'Title' 236 # title_label: 'Title'
237 url_label: 'Url' 237 url_label: 'Url'
238 # is_public_label: 'Public'
239 save_label: 'Salvează' 238 save_label: 'Salvează'
240 public: 239 public:
241 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 240 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index a4bf7dfe..ae05e036 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -235,7 +235,6 @@ entry:
235 page_title: 'Makaleyi düzenle' 235 page_title: 'Makaleyi düzenle'
236 title_label: 'Başlık' 236 title_label: 'Başlık'
237 url_label: 'Url' 237 url_label: 'Url'
238 is_public_label: 'Herkes tarafından erişime açık olsun mu?'
239 save_label: 'Kaydet' 238 save_label: 'Kaydet'
240 public: 239 public:
241 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 240 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
index 1c5e2aab..b9537975 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
@@ -27,11 +27,6 @@
27 {{ form_label(form.url) }} 27 {{ form_label(form.url) }}
28 {{ form_widget(form.url) }} 28 {{ form_widget(form.url) }}
29 </div> 29 </div>
30
31 <div class="input-field s12">
32 {{ form_widget(form.is_public) }}
33 {{ form_label(form.is_public) }}
34 </div>
35 <br> 30 <br>
36 31
37 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} 32 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}