Prechádzať zdrojové kódy

Minor - add docs, format code

Julio Montoya 6 rokov pred
rodič
commit
efc6d8bb41

+ 1 - 1
config/packages/sonata_admin.yaml

@@ -104,7 +104,7 @@ sonata_admin:
 #                #icon:  '<i class="fa fa-play-circle"></i>'
 #                label_catalogue: SonataAdminBundle
 #                items:
-##                    - sonata.admin.course
+#                    - sonata.admin.course
 #                    - sonata.admin.course_category
 #                    - sonata.admin.course_request
 #                    - sonata.admin.c_group_info

+ 3 - 3
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();

+ 1 - 1
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

+ 12 - 11
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:

+ 5 - 2
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();
     }
-
-
 }