diff --git a/src/Etsi/AppGuiasBundle/Controller/GuiaController.php b/src/Etsi/AppGuiasBundle/Controller/GuiaController.php index 5b607d8..2e9b503 100755 --- a/src/Etsi/AppGuiasBundle/Controller/GuiaController.php +++ b/src/Etsi/AppGuiasBundle/Controller/GuiaController.php @@ -365,6 +365,7 @@ public function indexAction($mensajes = array()) $em = $this->getDoctrine()->getManager(); $profesores = $em->getRepository('EtsiAppGuiasBundle:Profesor')->findAll(); + $entity = $this->get('security.context')->getToken()->getUser(); $guias = $em->getRepository('EtsiAppGuiasBundle:Guia')->findAll(); $areas = $em->getRepository('EtsiAppGuiasBundle:Area')->findAll(); $grados = $em->getRepository('EtsiAppGuiasBundle:Grado')->findAll(); @@ -391,9 +392,6 @@ public function indexAction($mensajes = array()) $asignaturas = $query->getResult(); - - $entity = $this->get('security.context')->getToken()->getUser(); - return $this->render( 'EtsiAppGuiasBundle::dashboard.html.twig', array( diff --git a/src/Etsi/AppGuiasBundle/Resources/public/js/guia.dashboard.js b/src/Etsi/AppGuiasBundle/Resources/public/js/guia.dashboard.js index b69a7ba..84033a8 100644 --- a/src/Etsi/AppGuiasBundle/Resources/public/js/guia.dashboard.js +++ b/src/Etsi/AppGuiasBundle/Resources/public/js/guia.dashboard.js @@ -27,6 +27,9 @@ $(function(){ $.fn.dataTableExt.afnFiltering.push( function(oSettings, aData, iDataIndex) { + if($(oSettings.nTable).attr('id')!=='tabla-todo') + return true; + var cursos = []; var estados = []; var cuatrimestres = []; diff --git a/src/Etsi/AppGuiasBundle/Resources/views/dashboard.html.twig b/src/Etsi/AppGuiasBundle/Resources/views/dashboard.html.twig index 04c7068..0e3e8e4 100644 --- a/src/Etsi/AppGuiasBundle/Resources/views/dashboard.html.twig +++ b/src/Etsi/AppGuiasBundle/Resources/views/dashboard.html.twig @@ -2,31 +2,27 @@ {% macro tupla(guia, estados, error, eliminar) %}