Portfolio: Fix lang var + set null on delete - refs BT#14560

chamilo · Jun 28, 2018 · 8384052 · 8384052
1 parent daea8c6
commit 8384052
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php
@@ -820,7 +820,7 @@
 ALTER TABLE portfolio ADD CONSTRAINT FK_A9ED1062A76ED395 FOREIGN KEY (user_id) REFERENCES user (id);
 ALTER TABLE portfolio ADD CONSTRAINT FK_A9ED106291D79BD3 FOREIGN KEY (c_id) REFERENCES course (id);
 ALTER TABLE portfolio ADD CONSTRAINT FK_A9ED1062613FECDF FOREIGN KEY (session_id) REFERENCES session (id);
-ALTER TABLE portfolio ADD CONSTRAINT FK_A9ED106212469DE2 FOREIGN KEY (category_id) REFERENCES portfolio_category (id);
+ALTER TABLE portfolio ADD CONSTRAINT FK_A9ED106212469DE2 FOREIGN KEY (category_id) REFERENCES portfolio_category (id) ON DELETE SET NULL;
 ALTER TABLE portfolio_category ADD CONSTRAINT FK_7AC64359A76ED395 FOREIGN KEY (user_id) REFERENCES user (id);
 INSERT INTO settings_current(variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES('course_create_active_tools','portfolio','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Portfolio', 0);
 */

diff --git a/main/portfolio/edit_item.php b/main/portfolio/edit_item.php
@@ -39,7 +39,7 @@
     $em->flush();
 
     Display::addFlash(
-        Display::return_message(get_lang('Updated'), 'success')
+        Display::return_message(get_lang('ItemUpdated'), 'success')
     );
 
     header("Location: $baseUrl");

diff --git a/main/portfolio/index.php b/main/portfolio/index.php
@@ -133,7 +133,7 @@
         $em->flush();
 
         Display::addFlash(
-            Display::return_message(get_lang('PortfolioItemDeleted'), 'success')
+            Display::return_message(get_lang('CategoryDeleted'), 'success')
         );
 
         header("Location: $baseUrl");
@@ -201,7 +201,7 @@
         $em->flush();
 
         Display::addFlash(
-            Display::return_message(get_lang('PortfolioItemDeleted'), 'success')
+            Display::return_message(get_lang('ItemDeleted'), 'success')
         );
 
         header("Location: $baseUrl");

diff --git a/src/Chamilo/CoreBundle/Entity/Portfolio.php b/src/Chamilo/CoreBundle/Entity/Portfolio.php
@@ -96,7 +96,7 @@ class Portfolio
      * @var \Chamilo\CoreBundle\Entity\PortfolioCategory
      *
      * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\PortfolioCategory", inversedBy="items")
-     * @ORM\JoinColumn(name="category_id", referencedColumnName="id")
+     * @ORM\JoinColumn(name="category_id", referencedColumnName="id", onDelete="SET NULL")
      */
     private $category;