From efc6d8bb41aba6906cbfeec6121038b1d07721af Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 20 Aug 2018 08:15:56 +0200 Subject: [PATCH] Minor - add docs, format code --- config/packages/sonata_admin.yaml | 2 +- main/install/install.lib.php | 6 ++--- .../Entity/Resource/ResourceNode.php | 2 +- src/CourseBundle/Resources/config/admin.yml | 23 ++++++++++--------- src/UserBundle/Entity/User.php | 7 ++++-- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/config/packages/sonata_admin.yaml b/config/packages/sonata_admin.yaml index 2ae57f3a29..f943915a7c 100644 --- a/config/packages/sonata_admin.yaml +++ b/config/packages/sonata_admin.yaml @@ -104,7 +104,7 @@ sonata_admin: # #icon: '' # label_catalogue: SonataAdminBundle # items: -## - sonata.admin.course +# - sonata.admin.course # - sonata.admin.course_category # - sonata.admin.course_request # - sonata.admin.c_group_info diff --git a/main/install/install.lib.php b/main/install/install.lib.php index 90a145e967..31ae4e00f3 100755 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -3188,10 +3188,11 @@ function finishInstallationWithContainer( $groupManager->updateGroup($group, true); } + // Install course tools (table "tool") $toolChain = $container->get('chamilo_course.tool_chain'); $toolChain->createTools($manager); - // Creating settings + // Installing schemas (filling settings_current table) $settingsManager->installSchemas($accessUrl); // Inserting data @@ -3201,7 +3202,6 @@ function finishInstallationWithContainer( $result->closeCursor(); // Create site - /** @var Chamilo\PageBundle\Entity\Site $site */ $site = $siteManager->create(); $site->setHost('localhost'); @@ -3245,9 +3245,9 @@ function finishInstallationWithContainer( $pageWelcome->setRouteName('welcome'); $pageWelcome->setParent($page); $pageWelcome->setSite($site); - $pageManager->save($pageWelcome); + // Creating page blocks $templateManager = $container->get('sonata.page.template_manager'); $template = $templateManager->get('default'); $templateContainers = $template->getContainers(); diff --git a/src/CoreBundle/Entity/Resource/ResourceNode.php b/src/CoreBundle/Entity/Resource/ResourceNode.php index ef989e733c..998327a4bf 100644 --- a/src/CoreBundle/Entity/Resource/ResourceNode.php +++ b/src/CoreBundle/Entity/Resource/ResourceNode.php @@ -19,7 +19,7 @@ use Symfony\Component\Validator\Constraints as Assert; */ class ResourceNode { - const PATH_SEPARATOR = '`'; + public const PATH_SEPARATOR = '`'; /** * @ORM\Id diff --git a/src/CourseBundle/Resources/config/admin.yml b/src/CourseBundle/Resources/config/admin.yml index e6510decdf..a5007a23d7 100644 --- a/src/CourseBundle/Resources/config/admin.yml +++ b/src/CourseBundle/Resources/config/admin.yml @@ -1,15 +1,16 @@ services: -# sonata.admin.course: -# class: Chamilo\CourseBundle\Admin\CourseAdmin -# tags: -# - { name: sonata.admin, manager_type: orm, audit: true, group: "LMS", label: "Course" } -# arguments: -# - ~ -# - Chamilo\CoreBundle\Entity\Course -# - ~ -# calls: -# - [ setTranslationDomain, [ChamiloCoreBundle]] -# - [ setToolChain, [@chamilo_course.tool_chain]] + sonata.admin.course: + class: Chamilo\CourseBundle\Admin\CourseAdmin + tags: + - { name: sonata.admin, manager_type: orm, group: "LMS", label: "Course" } + arguments: + - ~ + - Chamilo\CoreBundle\Entity\Course + - ~ + calls: + - [ setTranslationDomain, [ChamiloCoreBundle]] + - [ setToolChain, ['@chamilo_course.tool_chain']] + sonata.admin.course_rel_user: class: Chamilo\CourseBundle\Admin\CourseRelUserAdmin tags: diff --git a/src/UserBundle/Entity/User.php b/src/UserBundle/Entity/User.php index 7a2907d0ba..f3e7d3d771 100644 --- a/src/UserBundle/Entity/User.php +++ b/src/UserBundle/Entity/User.php @@ -1824,6 +1824,11 @@ class User extends BaseUser implements ThemeUser, EquatableInterface //implement return $this; } + /** + * @param array $roles + * + * @return $this + */ public function setRoles(array $roles) { $this->roles = []; @@ -2001,6 +2006,4 @@ class User extends BaseUser implements ThemeUser, EquatableInterface //implement return 'users/'.substr((string) $id, 0, 1).'/'.$id.'/'.'small_'.$this->getPictureUri(); } - - }