Fix entities

pull/3844/head
Julio Montoya 5 years ago
parent 3ae5c2d95f
commit ea8cc65a07
  1. 4
      public/main/inc/lib/usermanager.lib.php
  2. 2
      public/main/inc/lib/webservices/Rest.php
  3. 4
      public/main/webservices/registration.soap.php
  4. 3
      src/CoreBundle/Entity/AccessUrl.php
  5. 4
      src/CourseBundle/Entity/CThematic.php
  6. 6
      src/CourseBundle/Event/CourseAccess.php
  7. 2
      src/CourseBundle/Repository/CLinkRepository.php
  8. 2
      src/CourseBundle/Repository/CThematicRepository.php

@ -317,7 +317,7 @@ class UserManager
->setAuthSource($authSource) ->setAuthSource($authSource)
->setPhone($phone) ->setPhone($phone)
->setAddress($address) ->setAddress($address)
->setLanguage($language) ->setLocale($language)
->setRegistrationDate($now) ->setRegistrationDate($now)
->setHrDeptId($hr_dept_id) ->setHrDeptId($hr_dept_id)
->setActive($active) ->setActive($active)
@ -1149,7 +1149,7 @@ class UserManager
->setUsername($username) ->setUsername($username)
->setStatus($status) ->setStatus($status)
->setAuthSource($auth_source) ->setAuthSource($auth_source)
->setLanguage($language) ->setLocale($language)
->setLocale($language) ->setLocale($language)
->setEmail($email) ->setEmail($email)
->setOfficialCode($official_code) ->setOfficialCode($official_code)

@ -1846,7 +1846,7 @@ class Rest extends WebService
if (!in_array($value, $languages['folder'])) { if (!in_array($value, $languages['folder'])) {
throw new Exception(get_lang('LanguageUnavailable')); throw new Exception(get_lang('LanguageUnavailable'));
} }
$user->setLanguage($value); $user->setLocale($value);
break; break;
case 'registration_date': case 'registration_date':
$user->setRegistrationDate($value); $user->setRegistrationDate($value);

@ -1991,7 +1991,7 @@ function WSEditUser($params)
$user->setExpirationDate($expiration_date); $user->setExpirationDate($expiration_date);
} }
if (!empty($language)) { if (!empty($language)) {
$user->setLanguage($language); $user->setLocale($language);
} }
$user $user
@ -1999,7 +1999,7 @@ function WSEditUser($params)
->setStatus($status) ->setStatus($status)
->setOfficialCode($official_code) ->setOfficialCode($official_code)
->setPhone($phone) ->setPhone($phone)
->setPictureUri($picture_uri) //->setPictureUri($picture_uri)
->setHrDeptId($hr_dept_id) ->setHrDeptId($hr_dept_id)
->setActive(true); ->setActive(true);

@ -5,6 +5,7 @@
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;
use ApiPlatform\Core\Annotation\ApiResource; use ApiPlatform\Core\Annotation\ApiResource;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo; use Gedmo\Mapping\Annotation as Gedmo;
use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Serializer\Annotation\Groups;
@ -35,6 +36,8 @@ class AccessUrl extends AbstractResource implements ResourceInterface
protected $id; protected $id;
/** /**
* @var AccessUrlRelCourse[]|ArrayCollection
*
* @ORM\OneToMany(targetEntity="AccessUrlRelCourse", mappedBy="url", cascade={"persist"}, orphanRemoval=true) * @ORM\OneToMany(targetEntity="AccessUrlRelCourse", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
*/ */
protected $courses; protected $courses;

@ -59,7 +59,7 @@ class CThematic extends AbstractResource implements ResourceInterface
protected $active; protected $active;
/** /**
* @var CThematicPlan[] * @var CThematicPlan[]|ArrayCollection
* *
* @ORM\OneToMany( * @ORM\OneToMany(
* targetEntity="CThematicPlan", mappedBy="thematic", cascade={"persist", "remove"}, orphanRemoval=true * targetEntity="CThematicPlan", mappedBy="thematic", cascade={"persist", "remove"}, orphanRemoval=true
@ -68,7 +68,7 @@ class CThematic extends AbstractResource implements ResourceInterface
protected $plans; protected $plans;
/** /**
* @var CThematicAdvance[] * @var CThematicAdvance[]|ArrayCollection
* *
* @ORM\OrderBy({"startDate" = "ASC"}) * @ORM\OrderBy({"startDate" = "ASC"})
* *

@ -16,11 +16,7 @@ class CourseAccess extends Event
protected $user; protected $user;
protected $course; protected $course;
/** public function __construct(User $user, Course $course)
* @param $user
* @param $course
*/
public function __construct($user, $course)
{ {
$this->user = $user; $this->user = $user;
$this->course = $course; $this->course = $course;

@ -38,7 +38,7 @@ final class CLinkRepository extends ResourceRepository implements GridInterface
$newResource = $form->getData(); $newResource = $form->getData();
$newResource $newResource
->setDisplayOrder(0) ->setDisplayOrder(0)
->setOnHomepage(0) ->setOnHomepage('0')
; ;
return $newResource; return $newResource;

@ -23,6 +23,6 @@ final class CThematicRepository extends ResourceRepository
public function getResources(User $user, ResourceNode $parentNode, Course $course = null, Session $session = null, CGroup $group = null): QueryBuilder public function getResources(User $user, ResourceNode $parentNode, Course $course = null, Session $session = null, CGroup $group = null): QueryBuilder
{ {
return $this->getResourcesByCourse($user, $course, $session, $group, $parentNode); return $this->getResourcesByCourse( $course, $session, $group, $parentNode);
} }
} }

Loading…
Cancel
Save