diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-06-08 16:35:41 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-06-08 16:35:41 +0200 |
commit | 9b9b05008a96a45bbf6da4c0c1c1b1244b83c6af (patch) | |
tree | 8b73ad50783cf8066ec4171367e2dd1e26026636 /src/Wallabag/CoreBundle/Entity | |
parent | 3cf22a05416b9994aa458ea045d232264006e7cf (diff) | |
parent | ac9d58211e1c6676485ef15d023215e5a465f3a8 (diff) | |
download | wallabag-9b9b05008a96a45bbf6da4c0c1c1b1244b83c6af.tar.gz wallabag-9b9b05008a96a45bbf6da4c0c1c1b1244b83c6af.tar.zst wallabag-9b9b05008a96a45bbf6da4c0c1c1b1244b83c6af.zip |
Merge branch 'v2-edit-title' into v2
Diffstat (limited to 'src/Wallabag/CoreBundle/Entity')
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Entry.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Tag.php | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index b1998ab6..f139bbac 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php | |||
@@ -390,7 +390,7 @@ class Entry | |||
390 | /** | 390 | /** |
391 | * @param bool $isPublic | 391 | * @param bool $isPublic |
392 | */ | 392 | */ |
393 | public function setPublic($isPublic) | 393 | public function setIsPublic($isPublic) |
394 | { | 394 | { |
395 | $this->isPublic = $isPublic; | 395 | $this->isPublic = $isPublic; |
396 | } | 396 | } |
diff --git a/src/Wallabag/CoreBundle/Entity/Tag.php b/src/Wallabag/CoreBundle/Entity/Tag.php index afe9e1b9..92442df6 100644 --- a/src/Wallabag/CoreBundle/Entity/Tag.php +++ b/src/Wallabag/CoreBundle/Entity/Tag.php | |||
@@ -51,6 +51,12 @@ class Tag | |||
51 | $this->user = $user; | 51 | $this->user = $user; |
52 | $this->entries = new ArrayCollection(); | 52 | $this->entries = new ArrayCollection(); |
53 | } | 53 | } |
54 | |||
55 | public function __toString() | ||
56 | { | ||
57 | return $this->label; | ||
58 | } | ||
59 | |||
54 | /** | 60 | /** |
55 | * Get id. | 61 | * Get id. |
56 | * | 62 | * |