mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-16 04:00:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1063 from wallabag/v2-rename-tags-entity

Browse source 
Rename Tags entity
This commit is contained in:
Jeremy 2015-02-09 15:52:10 +01:00
parent 89c03230c3 fb8389f463
commit cbce162b40
4 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/config/routing.yml
View file

@ -18,11 +18,6 @@ login_check:
logout:
path: /logout
#wallabag_api:
# resource: "@WallabagApiBundle/Controller/"
# type: annotation
# prefix: /api
rest :
type : rest
resource : "routing_rest.yml"

8
src/Wallabag/CoreBundle/Controller/WallabagRestController.php
View file

@ -7,7 +7,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tags;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Service\Extractor;
class WallabagRestController extends Controller
@ -206,7 +206,7 @@ class WallabagRestController extends Controller
* }
* )
*/
public function deleteEntriesTagsAction(Entry $entry, Tags $tag)
public function deleteEntriesTagsAction(Entry $entry, Tag $tag)
{
}
@ -229,7 +229,7 @@ class WallabagRestController extends Controller
* }
* )
*/
public function getTagAction(Tags $tag)
public function getTagAction(Tag $tag)
{
}
@ -242,7 +242,7 @@ class WallabagRestController extends Controller
* }
* )
*/
public function deleteTagAction(Tags $tag)
public function deleteTagAction(Tag $tag)
{
}
}

28
src/Wallabag/CoreBundle/Entity/Tags.php → src/Wallabag/CoreBundle/Entity/Tag.php
View file

@ -5,28 +5,28 @@ namespace Wallabag\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
/**
* Tags
* Tag
*
* @ORM\Table(name="tags")
* @ORM\Table(name="tag")
* @ORM\Entity
*/
class Tags
class Tag
{
/**
* @var integer
*
* @ORM\Column(name="id", type="integer", nullable=false)
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="IDENTITY")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
/**
* @var string
*
* @ORM\Column(name="value", type="text", nullable=true)
* @ORM\Column(name="label", type="text")
*/
private $value;
private $label;
/**
* Get id
@ -39,24 +39,24 @@ class Tags
}
/**
* Set value
* Set label
*
* @param string $value
* @return Tags
* @param string $label
* @return Tag
*/
public function setValue($value)
public function setLabel($label)
{
$this->value = $value;
$this->label = $label;
return $this;
}
/**
* Get value
* Get label
*
* @return string
*/
public function getValue()
public function getLabel()
{
return $this->value;
}

8
src/Wallabag/CoreBundle/Entity/TagsEntries.php
View file

@ -15,23 +15,23 @@ class TagsEntries
/**
* @var integer
*
* @ORM\Column(name="id", type="integer", nullable=false)
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="IDENTITY")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
/**
* @var integer
*
* @ORM\Column(name="entry_id", type="integer", nullable=true)
* @ORM\Column(name="entry_id", type="integer")
*/
private $entryId;
/**
* @var integer
*
* @ORM\Column(name="tag_id", type="integer", nullable=true)
* @ORM\Column(name="tag_id", type="integer")
*/
private $tagId;