Merge pull request #2788 from Zettt/master

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Entity / Config.php

diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index 70364ab684b33638cc5d68286d0342adeb5aa197..b902ae2cb2ef00d055d5c6ae5605c413ea8519d2 100644 (file)
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -93,16 +93,16 @@ class Config
     /**
      * @var int
      *
-     * @ORM\Column(name="action_mark_as_read", type="integer", nullable=true)
+     * @ORM\Column(name="action_mark_as_read", type="integer", nullable=true, options={"default" = 0})
      */
     private $actionMarkAsRead;
 
     /**
      * @var int
      *
-     * @ORM\Column(name="view_mode", type="integer", nullable=true)
+     * @ORM\Column(name="list_mode", type="integer", nullable=true)
      */
-    private $viewMode;
+    private $listMode;
 
     /**
      * @ORM\OneToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="config")
@@ -349,19 +349,19 @@ class Config
     /**
      * @return int
      */
-    public function getViewMode()
+    public function getListMode()
     {
-        return $this->viewMode;
+        return $this->listMode;
     }
 
     /**
-     * @param int $viewMode
+     * @param int $listMode
      *
      * @return Config
      */
-    public function setViewMode($viewMode)
+    public function setListMode($listMode)
     {
-        $this->viewMode = $viewMode;
+        $this->listMode = $listMode;
 
         return $this;
     }