Merge pull request #1552 from jloguercio/1.11.x

Added Delete session with SequenceResource Linked validation

Author: jloguercio

main/inc/lib/sessionmanager.lib.php

@@ -1549,6 +1549,18 @@ public static function delete($id_checked, $from_ws = false)
 
         $userId = api_get_user_id();
 
+        /** @var \Chamilo\CoreBundle\Entity\Repository\SequenceRepository $repo */
+        $repo = Database::getManager()->getRepository('ChamiloCoreBundle:SequenceResource');
+        $sequenceResourse = $repo->findRequirementForResource(
+            $id_checked,
+            \Chamilo\CoreBundle\Entity\SequenceResource::SESSION_TYPE
+        );
+
+        if ($sequenceResourse) {
+            Display::addFlash(Display::return_message(get_lang('ThereIsASequenceResourceLinkedToThisSessionYouNeedToDeleteItFirst'), 'error'));
+            return false;
+        }
+
         if (is_array($id_checked)) {
             foreach ($id_checked as $sessionId) {
                 self::delete($sessionId);
@@ -1612,8 +1624,6 @@ public static function delete($id_checked, $from_ws = false)
         $extraFieldValue = new ExtraFieldValue('session');
         $extraFieldValue->deleteValuesByItem($id_checked);
 
-        /** @var \Chamilo\CoreBundle\Entity\Repository\SequenceRepository $repo */
-        $repo = Database::getManager()->getRepository('ChamiloCoreBundle:SequenceResource');
         $repo->deleteResource(
             $id_checked,
             \Chamilo\CoreBundle\Entity\SequenceResource::SESSION_TYPE
@@ -1627,6 +1637,8 @@ public static function delete($id_checked, $from_ws = false)
             api_get_utc_datetime(),
             $userId
         );
+
+        return true;
     }
 
     /**

main/session/session_list.php

@@ -19,8 +19,11 @@
 $list_type = isset($_REQUEST['list_type']) ? $_REQUEST['list_type'] : 'simple';
 
 if ($action == 'delete') {
-    SessionManager::delete($idChecked);
-    Display::addFlash(Display::return_message(get_lang('Deleted')));
+    $response = SessionManager::delete($idChecked);
+
+    if ($response) {
+        Display::addFlash(Display::return_message(get_lang('Deleted')));
+    }
     header('Location: session_list.php');
     exit();
 } elseif ($action == 'copy') {

src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php

@@ -75,14 +75,15 @@ public function getRequirementAndDependencies($resourceId, $type)
      *
      * @param int $resourceId
      * @param int $type
+     * @return boolean
      */
     public function deleteResource($resourceId, $type)
     {
         $sequence = $this->findRequirementForResource($resourceId, $type);
 
         if ($sequence && $sequence->hasGraph()) {
             $em = $this->getEntityManager();
-            $graph = $sequence->getUnSerializeGraph();
+            $graph = $sequence->getSequence()->getUnSerializeGraph();
 
             $mainVertex = $graph->getVertex($resourceId);
             $vertices = $graph->getVertices();
@@ -92,10 +93,10 @@ public function deleteResource($resourceId, $type)
                 $subResourceId = $vertex->getId();
                 $subSequence = $this->findRequirementForResource($subResourceId, $type);
                 if ($sequence && $subSequence->hasGraph()) {
-                    $graph = $subSequence->getUnSerializeGraph();
+                    $graph = $subSequence->getSequence()->getUnSerializeGraph();
                     $subMainVertex = $graph->getVertex($resourceId);
                     $subMainVertex->destroy();
-                    $subSequence->setGraphAndSerialize($graph);
+                    $subSequence->getSequence()->setGraphAndSerialize($graph);
                     $em->persist($subSequence);
                 }
             }