Fixing session CRUD.

main/admin/session_list.php

@@ -4,14 +4,10 @@
  * List sessions in an efficient and usable way
  * @package chamilo.admin
  */
-/**
- * Code
- */
-$language_file = array('admin', 'courses');
+
 $cidReset = true;
 
 //require_once '../inc/global.inc.php';
-$this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script(true);
 

main/inc/ajax/model.ajax.php

@@ -4,10 +4,6 @@
 // @todo this could be integrated in the inc/lib/model.lib.php + try to clean this file
 // @todo this file was rewrote in the model ajax controller
 
-$language_file = array('admin', 'exercice', 'gradebook', 'tracking');
-
-require_once '../global.inc.php';
-
 $libpath = api_get_path(LIBRARY_PATH);
 
 // 1. Setting variables needed by jqgrid

main/session/session_add.php

@@ -20,10 +20,10 @@ $htmlHeadXtra[] = api_get_jquery_libraries_js(array('jquery-ui-i18n'));
 $htmlHeadXtra = api_get_datetime_picker_js($htmlHeadXtra);
 
 $id = null;
-$url_action = api_get_self();
+$urlAction = api_get_self();
 if (isset($_GET['id'])) {
     $id = intval($_GET['id']);
-    $url_action = '?id='.$id;
+    $urlAction = '?id='.$id;
 }
 
 $add_coach = null;
@@ -282,7 +282,13 @@ echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_list.php">'.
 echo '</div>';
 
 //$form->display();
+$em = Container::getEntityManager();
+$request = Container::getRequest();
+
 $session = new Session();
+if (!empty($id)) {
+    $session = $em->getRepository('ChamiloCoreBundle:Session')->find($id);
+}
 
 $builder = Container::getFormFactory()->createBuilder(
     new SessionType(),
@@ -293,12 +299,8 @@ $form = $builder->getForm();
 $form->handleRequest($request);
 
 if ($form->isValid()) {
-    $em = Container::getEntityManager();
-    $session = $form->getData();
-    $em->persist($session);
     $em->flush();
-
-    Container::addMessage(get_lang('Updated'));
+    Container::addFlash(get_lang('Updated'));
     $url = Container::getRouter()->generate(
         'main',
         array('name' => 'session/session_list.php')
@@ -307,11 +309,10 @@ if ($form->isValid()) {
     exit;
 }
 
-$url = api_get_self();
 echo Container::getTemplate()->render(
     'ChamiloCoreBundle:Legacy:form.html.twig',
     array(
         'form' => $form->createView(),
-        'url' => $url
+        'url' => $urlAction
     )
 );

main/session/session_list.php

@@ -81,7 +81,7 @@ $extra_params['postData'] =array(
 //With this function we can add actions to the jgrid (edit, delete, etc)
 $action_links = '
 function action_formatter(cellvalue, options, rowObject) {
-    return \'<a href="session_add.php?page=resume_session.php&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
+    return \'<a href="session_add.php?id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
     '&nbsp;<a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png',get_lang('SubscribeUsersToSession'),'',ICON_SIZE_SMALL).'</a>'.
     '&nbsp;<a href="add_courses_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('courses_to_session.png',get_lang('SubscribeCoursesToSession'),'',ICON_SIZE_SMALL).'</a>'.
     '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="session_list.php?action=copy&idChecked=\'+options.rowId+\'">'.Display::return_icon('copy.png',get_lang('Copy'),'',ICON_SIZE_SMALL).'</a>'.

src/Chamilo/CoreBundle/Controller/LegacyController.php

@@ -22,12 +22,11 @@ class LegacyController extends BaseController
 
     /**
      * @param $name
+     * @param Request $request
      * @return Response
      */
-    public function classicAction($name)
+    public function classicAction($name, Request $request)
     {
-        $request = $this->getRequest();
-
         // get.
         $_GET = $request->query->all();
         // post.
@@ -41,6 +40,7 @@ class LegacyController extends BaseController
 
         // Legacy inclusions
         Container::setSession($request->getSession());
+
         $dbConnection = $this->container->get('database_connection');
         $database  = new \Database($dbConnection, array());
         Container::$urlGenerator = $this->container->get('router');

src/Chamilo/CoreBundle/Entity/Session.php

@@ -5,10 +5,11 @@ namespace Chamilo\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 
 /**
  * Session
- *
+ * @UniqueEntity("name")
  * @ORM\Table(name="session", uniqueConstraints={@ORM\UniqueConstraint(name="name", columns={"name"})}, indexes={@ORM\Index(name="idx_id_coach", columns={"id_coach"}), @ORM\Index(name="idx_id_session_admin_id", columns={"session_admin_id"})})
  * @ORM\Entity
  */

src/Chamilo/CoreBundle/Framework/Container.php

@@ -25,6 +25,7 @@ class Container
      */
     public static $container;
     public static $session;
+    public static $request;
     public static $configuration;
     public static $urlGenerator;
     public static $security;
@@ -136,9 +137,14 @@ class Container
      */
     public static function getRequest()
     {
-        return self::$container->get('request_stack');
+        return self::$container->get('request');
     }
 
+    /*public static function setRequest($request)
+    {
+        self::$request = $request;
+    }*/
+
     /**
      * @return Session
      */
@@ -257,7 +263,7 @@ class Container
      * @param string $message
      * @param string $type error|success|warning|danger
      */
-    public static function addMessage($message, $type = 'success')
+    public static function addFlash($message, $type = 'success')
     {
         $session = self::getSession();
         $session->getFlashBag()->add($type, $message);

src/Chamilo/CoreBundle/Resources/views/Legacy/form.html.twig

@@ -1,3 +1,9 @@
-<form action="{{ url }}" method="POST" class="form-horizontal" role="form">
-    {{ form_widget(form) }}
-</form>
+<div class="col-md-12">
+    <div class="box box-primary">
+        <form action="{{ url }}" method="POST" class="form-horizontal" role="form">
+            <div class="box-body">
+            {{ form_widget(form) }}
+            </div>
+        </form>
+    </div>
+</div>

src/Chamilo/CoreBundle/Resources/views/layout.html.twig

@@ -78,8 +78,7 @@
 
 {% block javascripts_head %}
     {% javascripts
-    '@jqgrid_js'
-    "@admin_lte_all"
+        "@admin_lte_all"
     %}
     <script src="{{ asset_url }}"></script>
     {% endjavascripts %}
@@ -89,6 +88,7 @@
     {% endjavascripts %}
 
     {# Chamilo #}
+    <script type="text/javascript" src="{{ asset('bundles/chamilocore/js/jqgrid/js/jquery.jqGrid.min.js') }}"></script>
     <script type="text/javascript" src="{{ asset('bundles/chamilocore/js/chosen/chosen.jquery.js') }}"></script>
     <script type="text/javascript" src="{{ asset('bundles/chamilocore/js/tag/jquery.fcbkcomplete.js') }}"></script>