Author: josx Date: 2007-01-15 14:12:22 -0300 (Mon, 15 Jan 2007) New Revision: 4014 Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php prosistem/alba/trunk/alba/apps/principal/modules/division/validate/edit.yml Log: Problemas de validacion al dar de alta divisiones ( ticket #96 ) Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php 2007-01-15 16:20:46 UTC (rev 4013) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php 2007-01-15 17:12:22 UTC (rev 4014) @@ -23,8 +23,8 @@ * division Acciones * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author Jos�Luis Di Biase <[email protected]> + * @author H�tor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -36,8 +36,8 @@ protected function addFiltersCriteria(&$c) { - $c->addJoin(DivisionPeer::FK_TURNOS_ID, TurnosPeer::ID, Criteria::LEFT_JOIN); - $c->addJoin(TurnosPeer::FK_CICLOLECTIVO_ID, CiclolectivoPeer::ID, Criteria::LEFT_JOIN); + $c->addJoin(DivisionPeer::FK_TURNOS_ID, TurnosPeer::ID); + $c->addJoin(TurnosPeer::FK_CICLOLECTIVO_ID, CiclolectivoPeer::ID); $c->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getAttribute('fk_establecimiento_id')); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php 2007-01-15 16:20:46 UTC (rev 4013) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php 2007-01-15 17:12:22 UTC (rev 4014) @@ -4,7 +4,7 @@ $criteriaT->addJoin(TurnosPeer::FK_CICLOLECTIVO_ID, CiclolectivoPeer::ID); $turnos = TurnosPeer::doSelect($criteriaT); $optionsTurnos = array(); - $optionsTurnos[] = ">>Seleccione un Turno<<"; + $optionsTurnos[""] = ">>Seleccione un Turno<<"; foreach ($turnos as $turno) { $optionsTurnos[$turno->getId()] = $turno->getDescripcion(); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/validate/edit.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/validate/edit.yml 2007-01-15 16:20:46 UTC (rev 4013) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/validate/edit.yml 2007-01-15 17:12:22 UTC (rev 4014) @@ -1,6 +1,8 @@ methods: post: - "division{descripcion}" + - "division{fk_anio_id}" + - "division{fk_turnos_id}" fillin: enabled: on @@ -10,6 +12,15 @@ required: Yes required_msg: El campo descripción es obligatorio validators: caracteresMaximos255 + + division{fk_turnos_id}: + required: Yes + required_msg: El campo Turnos es obligatorio + + division{fk_anio_id}: + required: Yes + required_msg: El campo Año es obligatorio + caracteresMaximos255: class: sfStringValidator