Calendar: final fix default entity activation that should only be activated if the option is activated to fix commit #a41095b7

src/Chamilo/CoreBundle/Entity/AgendaEventInvitation.php

@@ -14,9 +14,9 @@ use Doctrine\ORM\Mapping as ORM;
  * @ORM\Table(name="agenda_event_invitation")
  * Add @ to the next lineactivating the agenda_collective_invitations configuration setting.
  * ORM\Entity()
- * @ORM\InheritanceType("SINGLE_TABLE")
- * @ORM\DiscriminatorColumn(name="type", type="string")
- * @ORM\DiscriminatorMap({
+ * ORM\InheritanceType("SINGLE_TABLE")
+ * ORM\DiscriminatorColumn(name="type", type="string")
+ * ORM\DiscriminatorMap({
  *     "invitation" = "Chamilo\CoreBundle\Entity\AgendaEventInvitation",
  *     "subscription" = "Chamilo\CoreBundle\Entity\AgendaEventSubscription"
  * })

src/Chamilo/CoreBundle/Entity/AgendaEventInvitee.php

@@ -12,9 +12,9 @@ use Doctrine\ORM\Mapping as ORM;
  * @ORM\Table(name="agenda_event_invitee")
  * Add @ to the next lineactivating the agenda_collective_invitations configuration setting.
  * ORM\Entity()
- * @ORM\InheritanceType("SINGLE_TABLE")
- * @ORM\DiscriminatorColumn(name="type", type="string")
- * @ORM\DiscriminatorMap({
+ * ORM\InheritanceType("SINGLE_TABLE")
+ * ORM\DiscriminatorColumn(name="type", type="string")
+ * ORM\DiscriminatorMap({
  *     "invitee" = "Chamilo\CoreBundle\Entity\AgendaEventInvitee",
  *     "subscriber" = "Chamilo\CoreBundle\Entity\AgendaEventSubscriber"
  * })

src/Chamilo/CoreBundle/Entity/AgendaEventSubscriber.php

@@ -7,7 +7,7 @@ namespace Chamilo\CoreBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity()
+ * ORM\Entity()
  */
 class AgendaEventSubscriber extends AgendaEventInvitee
 {

src/Chamilo/CoreBundle/Entity/AgendaEventSubscription.php

@@ -7,7 +7,7 @@ namespace Chamilo\CoreBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity()
+ * ORM\Entity()
  */
 class AgendaEventSubscription extends AgendaEventInvitation
 {

src/Chamilo/CoreBundle/Entity/PersonalAgenda.php

@@ -17,9 +17,9 @@ use Doctrine\ORM\Mapping as ORM;
 class PersonalAgenda
 {
     // Uncomment next line when activating the agenda_collective_invitations configuration setting.
-    use EventCollectiveTrait;
+    //use EventCollectiveTrait;
     // Uncomment next line when activating the agenda_event_subscriptions configuration setting.
-    use EventSubscribableTrait;
+    //use EventSubscribableTrait;
 
     /**
      * @var int

src/Chamilo/CoreBundle/Entity/Portfolio.php

@@ -24,7 +24,7 @@ use Doctrine\ORM\Mapping as ORM;
  *  }
  * )
  * Add @ to the next line if api_get_configuration_value('allow_portfolio_tool') is true
- * @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\PortfolioRepository")
+ * ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\PortfolioRepository")
  */
 class Portfolio
 {

src/Chamilo/CoreBundle/Entity/PortfolioAttachment.php

@@ -13,7 +13,7 @@ use Doctrine\ORM\Mapping as ORM;
  *
  * @ORM\Table(name="portfolio_attachment")
  * Add @ to the next line if api_get_configuration_value('allow_portfolio_tool') is true
- * @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\PortfolioAttachmentRepository")
+ * ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\PortfolioAttachmentRepository")
  */
 class PortfolioAttachment
 {

src/Chamilo/CoreBundle/Entity/PortfolioCategory.php

@@ -20,7 +20,7 @@ use Doctrine\ORM\Mapping as ORM;
  *  }
  * )
  * Add @ to the next line if api_get_configuration_value('allow_portfolio_tool') is true
- * @ORM\Entity()
+ * ORM\Entity()
  */
 class PortfolioCategory
 {

src/Chamilo/CoreBundle/Entity/PortfolioComment.php

@@ -18,7 +18,7 @@ use Gedmo\Mapping\Annotation as Gedmo;
  * @Gedmo\Tree(type="nested")
  * @ORM\Table(name="portfolio_comment")
  * Add @ to the next line if api_get_configuration_value('allow_portfolio_tool') is true
- * @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\PortfolioCommentRepository")
+ * ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\PortfolioCommentRepository")
  */
 class PortfolioComment
 {

src/Chamilo/CoreBundle/Entity/PortfolioRelTag.php

@@ -8,7 +8,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table(name="portfolio_rel_tag")
- * @ORM\Entity()
+ * ORM\Entity()
  */
 class PortfolioRelTag
 {