Author: ftoledo Date: 2009-04-27 16:14:33 -0300 (Mon, 27 Apr 2009) New Revision: 6131 Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php Log: resol. conflicto 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 2009-04-27 18:38:53 UTC (rev 6130) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2009-04-27 19:14:33 UTC (rev 6131) @@ -2,7 +2,7 @@ /** * This file is part of Alba. - * + * * Alba is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -33,9 +33,9 @@ class horarioescolarActions extends autohorarioescolarActions { - - public function executeEdit($request) { + public function executeEdit($request) + { $evento_generico = new miEvento(new sfEventDispatcher()); $this->horarioescolar = $this->getHorarioescolarOrCreate(); $this->evento = $evento_generico->getEventoOrCreate($this->horarioescolar->getFkEventoId()); @@ -130,7 +130,7 @@ } - + protected function getLabels() { return array( 'horarioescolar{nombre}' => 'Nombre:', @@ -145,8 +145,8 @@ ); } - - + + public function handleErrorEdit() { $this->preExecute(); $this->horarioescolar = $this->getHorarioescolarOrCreate(); @@ -158,6 +158,5 @@ $this->labels = $this->getLabels(); return sfView::SUCCESS; } - } ?>