[Alba-desarrollo] SVN Alba r4913 - in prosistem/alba/trunk/alba: apps/principal/modules/relAlumnoDivision/templates lib/model/om

Lun Ago 6 17:31:25 CEST 2007

Author: josx
Date: 2007-08-06 12:31:24 -0300 (Mon, 06 Aug 2007)
New Revision: 4913

Modified:
   prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php
   prosistem/alba/trunk/alba/lib/model/om/BaseTurno.php
Log:
Arreglos extras de la modificacion de las tablas turnos

Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php
===================================================================

--- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php	2007-08-03 21:10:17 UTC (rev 4912)
+++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php	2007-08-06 15:31:24 UTC (rev 4913)
@@ -1,7 +1,7 @@
 <?php 
     $c = new Criteria(); 
     $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id'));    
-    $c->add(TurnosPeer::FK_CICLOLECTIVO_ID, $sf_user->getAttribute('fk_ciclolectivo_id'));
+    $c->add(TurnoPeer::FK_CICLOLECTIVO_ID, $sf_user->getAttribute('fk_ciclolectivo_id'));
     $c->addJoin(AnioPeer::ID,DivisionPeer::FK_ANIO_ID);
     $c->addJoin(TurnoPeer::ID,DivisionPeer::FK_TURNO_ID);
     

Modified: prosistem/alba/trunk/alba/lib/model/om/BaseTurno.php
===================================================================
--- prosistem/alba/trunk/alba/lib/model/om/BaseTurno.php	2007-08-03 21:10:17 UTC (rev 4912)
+++ prosistem/alba/trunk/alba/lib/model/om/BaseTurno.php	2007-08-06 15:31:24 UTC (rev 4913)
@@ -25,7 +25,7 @@
 
 
 	
-	protected $descripcion = 'null';
+	protected $descripcion;
 
 	
 	protected $aCiclolectivo;
@@ -187,7 +187,7 @@
 			$v = (string) $v; 
 		}
 
-		if ($this->descripcion !== $v || $v === 'null') {
+		if ($this->descripcion !== $v) {
 			$this->descripcion = $v;
 			$this->modifiedColumns[] = TurnoPeer::DESCRIPCION;
 		}


