Author: hsanchez Date: 2007-01-29 15:57:34 -0300 (Mon, 29 Jan 2007) New Revision: 4098 Modified: prosistem/alba/trunk/alba/apps/principal/modules/escalanota/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/espacios/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/horarioescolartipo/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/legajocategoria/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/locacion/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/menu/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/modulo/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/organizacion/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/pais/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/permiso/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/preferencia/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/provincia/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relCalendariovacunacionAlumno/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/rol/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipoasistencia/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipodocente/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipoiva/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipolocacion/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php Log: Agregando pre-execute :( puede fallar Modified: prosistem/alba/trunk/alba/apps/principal/modules/escalanota/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/escalanota/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/escalanota/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -32,6 +32,9 @@ class escalanotaActions extends autoescalanotaActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/espacios/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/espacios/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/espacios/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,8 @@ class espaciosActions extends autoespaciosActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } - } Modified: prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,9 @@ class establecimientoActions extends autoestablecimientoActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } function executeEditLocacion() { Modified: prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -34,10 +34,12 @@ class feriadoActions extends autoferiadoActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + � �} + public function executeLinkMinisterio() { - - return $this->redirect("http://www.mininterior.gov.ar/servicios/feriados.asp"); - + return $this->redirect("http://www.mininterior.gov.ar/servicios/feriados.asp"); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,8 +33,12 @@ class horarioescolarActions extends autohorarioescolarActions { - protected function updateHorarioescolarFromRequest() - { + + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + �} + + protected function updateHorarioescolarFromRequest(){ $horarioescolar = $this->getRequestParameter('horarioescolar'); $horarioescolar['hora_inicio'] = $this->_add_zeros($horarioescolar['hora_inicio']['hour'],2).":".$this->_add_zeros($horarioescolar['hora_inicio']['minute'],2)." ".$horarioescolar['hora_inicio']['ampm']; Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolartipo/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolartipo/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolartipo/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,4 +33,7 @@ class horarioescolartipoActions extends autohorarioescolartipoActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } } Modified: prosistem/alba/trunk/alba/apps/principal/modules/legajocategoria/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/legajocategoria/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/legajocategoria/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,9 @@ class legajocategoriaActions extends autolegajocategoriaActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,10 @@ class legajopedagogicoActions extends sfActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } + /** * Executes index action * Modified: prosistem/alba/trunk/alba/apps/principal/modules/locacion/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/locacion/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/locacion/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,10 @@ class locacionActions extends autolocacionActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } + function executeEspaciosPorLocacion(){ $this->redirect( 'relLocacionEspacio/list?filters%5Bfk_locacion_id%5D='.$this->getRequestParameter('id') .'&filter=filtrar'); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/menu/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/menu/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/menu/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,4 +33,7 @@ class menuActions extends automenuActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + � �} } Modified: prosistem/alba/trunk/alba/apps/principal/modules/modulo/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/modulo/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/modulo/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,9 @@ class moduloActions extends automoduloActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/organizacion/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/organizacion/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/organizacion/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,9 @@ class organizacionActions extends autoorganizacionActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/pais/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/pais/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/pais/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,9 @@ class paisActions extends autopaisActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/permiso/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/permiso/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/permiso/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,8 +33,9 @@ class permisoActions extends autopermisoActions { - - + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/preferencia/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/preferencia/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/preferencia/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,9 @@ class preferenciaActions extends autopreferenciaActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/provincia/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/provincia/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/provincia/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -32,6 +32,10 @@ */ class provinciaActions extends autoprovinciaActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } + protected function addSortCriteria (&$c) { if ($sort_column = $this->getUser()->getAttribute('sort', 'nombre_corto', 'sf_admin/provincia/sort')) { $sort_column = Propel::getDB($c->getDbName())->quoteIdentifier($sort_column); Modified: prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/relActividadDocente/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,9 @@ class relActividadDocenteActions extends autorelActividadDocenteActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } function executeListadoDocente() { $this->redirect('docente?action=list'); Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,4 +33,7 @@ class relAlumnoDivisionActions extends autorelAlumnoDivisionActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } } Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAnioActividad/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,9 @@ class relAnioActividadActions extends autorelAnioActividadActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/relCalendariovacunacionAlumno/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relCalendariovacunacionAlumno/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/relCalendariovacunacionAlumno/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,10 @@ class relCalendariovacunacionAlumnoActions extends autorelCalendariovacunacionAlumnoActions { + + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } /** * Ir a la cuenta del alumno */ Modified: prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -32,6 +32,10 @@ class responsableActions extends autoresponsableActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } + function executeIrCuenta(){ //Obtener el id de cuenta. Modified: prosistem/alba/trunk/alba/apps/principal/modules/rol/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/rol/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/rol/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,8 +33,10 @@ class rolActions extends autorolActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } - function executeEditPermiso() { // estos son los permisos que tiene el rol $c = new Criteria(); Modified: prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -32,7 +32,10 @@ class seguridadActions extends sfActions { - + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + �} + public function executeLogin() { $this->error_inicio_sesion = false; Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipoasistencia/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipoasistencia/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipoasistencia/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,4 +33,7 @@ class tipoasistenciaActions extends autotipoasistenciaActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + � �} } Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipodocente/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipodocente/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipodocente/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,4 +33,7 @@ class tipodocenteActions extends autotipodocenteActions { + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } } Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -32,6 +32,10 @@ */ class tipodocumentoActions extends autotipodocumentoActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } + protected function addSortCriteria (&$c) { if ($sort_column = $this->getUser()->getAttribute('sort', 'nombre', 'sf_admin/tipodocumento/sort')) { $sort_column = Propel::getDB($c->getDbName())->quoteIdentifier($sort_column); Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -32,4 +32,7 @@ class tipoespacioActions extends autotipoespacioActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + � �} } Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipoiva/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipoiva/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipoiva/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,6 +33,9 @@ class tipoivaActions extends autotipoivaActions { + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipolocacion/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipolocacion/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipolocacion/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -33,4 +33,7 @@ class tipolocacionActions extends autotipolocacionActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } } Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -32,6 +32,10 @@ class turnosActions extends autoturnosActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } + function addFiltersCriteria(&$c) { $c->add(TurnosPeer::FK_CICLOLECTIVO_ID,$this->getUser()->getAttribute('fk_ciclolectivo_id')); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php 2007-01-29 18:44:44 UTC (rev 4097) +++ prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) @@ -34,6 +34,10 @@ class usuarioActions extends autousuarioActions { + public function preExecute() { + � � � � $this->vista = $this->getRequestParameter('vista'); + } + function updateUsuarioFromRequest() { $usuario = $this->getRequestParameter('usuario');