[Alba-desarrollo] SVN Alba r5196 - in prosistem/alba/trunk/alba/apps/principal/modules: evento/templates horarioescolar/templates

[commits en pressenter.com.ar]

Author: sabino
Date: 2007-10-03 17:35:13 -0300 (Wed, 03 Oct 2007)
New Revision: 5196

Modified:
   prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php
   prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_edit_form.php
   prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/editSuccess.php
Log:
#259 parche de solucion


Modified: prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php	2007-10-03 20:33:29 UTC (rev 5195)
+++ prosistem/alba/trunk/alba/apps/principal/modules/evento/templates/_carga_evento.php	2007-10-03 20:35:13 UTC (rev 5196)
@@ -22,7 +22,7 @@
         } else {
             $hora_asociada = true;
         }
-        
+	
         switch($evento->getFrecuencia()) {
             case '0': $activar_repeticion = false; break;
             case '4': $activar_repeticion = true; $seleccion_4 = true; $seleccion_5 = $seleccion_6 = $seleccion_7 = false; $mostrar_div_diaria = ""; break;
@@ -55,6 +55,17 @@
 
 
     }
+	else { //esto es un parche para que funcione el check de hora asociada
+		// esta logica tiene que ir en la logica de un component
+		// y hay que modiicar las incluciones de esto que ahora son 
+		// include_partial a getComponent
+	if ($evento_tmp = $sf_request->getParameter('evento')) {
+		if (isset($evento_tmp['hora_asociada']))
+			$hora_asociada = $evento_tmp['hora_asociada'];
+		if (isset($evento_tmp['activar_repeticion']))
+			$activar_repeticion = $evento_tmp['activar_repeticion'];
+	}
+	}
 ?>
 
 <script type="text/javascript">

Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_edit_form.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_edit_form.php	2007-10-03 20:33:29 UTC (rev 5195)
+++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/_edit_form.php	2007-10-03 20:35:13 UTC (rev 5196)
@@ -41,7 +41,7 @@
 </div>
 
 
-<?php include_partial('evento/carga_evento', array('horarioescolar' => $horarioescolar, 'evento' => $evento)) ?>
+<?php include_partial('evento/carga_evento', array('evento' => $evento)); ?>
 
 
 

Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/editSuccess.php
===================================================================
--- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/editSuccess.php	2007-10-03 20:33:29 UTC (rev 5195)
+++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/templates/editSuccess.php	2007-10-03 20:35:13 UTC (rev 5196)
@@ -12,16 +12,16 @@
 array()) ?></h1>
 
 <div id="sf_admin_header">
-<?php include_partial('horarioescolar/edit_header', array('horarioescolar' => $horarioescolar)) ?>
+<?php include_partial('edit_header', array('horarioescolar' => $horarioescolar)) ?>
 </div>
 
 <div id="sf_admin_content">
-<?php include_partial('horarioescolar/edit_messages', array('horarioescolar' => $horarioescolar, 'labels' => $labels)) ?>
-<?php include_partial('horarioescolar/edit_form', array('horarioescolar' => $horarioescolar, 'labels' => $labels, 'evento' => $evento)) ?>
+<?php include_partial('edit_messages', array('horarioescolar' => $horarioescolar, 'labels' => $labels)) ?>
+<?php include_partial('edit_form', array('horarioescolar' => $horarioescolar, 'labels' => $labels, 'evento' => $evento)) ?>
 </div>
 
 <div id="sf_admin_footer">
-<?php include_partial('horarioescolar/edit_footer', array('horarioescolar' => $horarioescolar)) ?>
+<?php include_partial('edit_footer', array('horarioescolar' => $horarioescolar)) ?>
 </div>
 
 </div>