Show resource node author

pull/3413/head
Julio Montoya 5 years ago
parent 8f878444f9
commit adf4bf18a3
  1. 9
      assets/vue/views/documents/Show.vue
  2. 6
      src/CoreBundle/Entity/ResourceNode.php
  3. 10
      src/CoreBundle/Entity/User.php

@ -37,6 +37,15 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr>
<td><strong>{{ $t('Author') }}</strong></td>
<td>
{{ item['resourceNode'].creator.username }}
</td>
<td><strong></strong></td>
<td>
</td>
</tr>
<tr> <tr>
<td><strong>{{ $t('title') }}</strong></td> <td><strong>{{ $t('title') }}</strong></td>
<td> <td>

@ -110,9 +110,7 @@ class ResourceNode
* @var User the creator of this node * @var User the creator of this node
* @Assert\Valid() * @Assert\Valid()
* @Groups({"resource_node:read", "resource_node:write", "document:write"}) * @Groups({"resource_node:read", "resource_node:write", "document:write"})
* @ORM\ManyToOne( * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User", inversedBy="resourceNodes")
* targetEntity="Chamilo\CoreBundle\Entity\User", inversedBy="resourceNodes"
* )
* @ORM\JoinColumn(name="creator_id", referencedColumnName="id", nullable=true, onDelete="CASCADE") * @ORM\JoinColumn(name="creator_id", referencedColumnName="id", nullable=true, onDelete="CASCADE")
*/ */
protected $creator; protected $creator;
@ -269,7 +267,7 @@ class ResourceNode
/** /**
* Sets the parent resource. * Sets the parent resource.
*/ */
public function setParent(self $parent = null): self public function setParent(ResourceNode $parent = null): self
{ {
$this->parent = $parent; $this->parent = $parent;

@ -50,7 +50,7 @@ use Symfony\Component\Validator\Mapping\ClassMetadata;
* } * }
* ) * )
* @UniqueEntity("username") * @UniqueEntity("username")
* @ORM\Entity() * @ORM\Entity
*/ */
class User implements UserInterface, EquatableInterface class User implements UserInterface, EquatableInterface
{ {
@ -66,7 +66,7 @@ class User implements UserInterface, EquatableInterface
/** /**
* @var int * @var int
* @Groups({"user:read"}) * @Groups({"user:read", "resource_node:read"})
* @ORM\Column(name="id", type="integer") * @ORM\Column(name="id", type="integer")
* @ORM\Id * @ORM\Id
* @ORM\GeneratedValue(strategy="AUTO") * @ORM\GeneratedValue(strategy="AUTO")
@ -89,14 +89,14 @@ class User implements UserInterface, EquatableInterface
* @var string * @var string
* @Assert\NotBlank() * @Assert\NotBlank()
* @ApiProperty(iri="http://schema.org/name") * @ApiProperty(iri="http://schema.org/name")
* @Groups({"user:read", "user:write"}) * @Groups({"user:read", "user:write", "resource_node:read"})
* @ORM\Column(name="firstname", type="string", length=64, nullable=true, unique=false) * @ORM\Column(name="firstname", type="string", length=64, nullable=true, unique=false)
*/ */
protected $firstname; protected $firstname;
/** /**
* @var string * @var string
* @Groups({"user:read", "user:write"}) * @Groups({"user:read", "user:write", "resource_node:read"})
* @ORM\Column(name="lastname", type="string", length=64, nullable=true, unique=false) * @ORM\Column(name="lastname", type="string", length=64, nullable=true, unique=false)
*/ */
protected $lastname; protected $lastname;
@ -124,7 +124,7 @@ class User implements UserInterface, EquatableInterface
/** /**
* @var string * @var string
* @Groups({"user:read", "user:write", "course:read"}) * @Groups({"user:read", "user:write", "course:read", "resource_node:read"})
* @Assert\NotBlank() * @Assert\NotBlank()
* @ORM\Column(name="username", type="string", length=100, nullable=false, unique=true) * @ORM\Column(name="username", type="string", length=100, nullable=false, unique=true)
*/ */

Loading…
Cancel
Save