Author: josx Date: 2007-09-26 16:36:34 -0300 (Wed, 26 Sep 2007) New Revision: 5171 Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php Log: Arreglos de las URL del calendario cuando envian parametros Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php 2007-09-26 19:33:42 UTC (rev 5170) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php 2007-09-26 19:36:34 UTC (rev 5171) @@ -247,6 +247,9 @@ // 'search_box' => BASE.'templates/'.$template.'/search_box.tpl' // )); + $url_nueva = sfContext::getInstance()->getRequest()->getUri(); + $url_nueva = str_replace("/view/".$context->getRequest()->getParameter('view')."/date/".$getdate,"", $url_nueva); + $page->replace_files(array( 'header' => '', 'event_js' => "", @@ -258,10 +261,10 @@ $prefixUri = sfContext::getInstance()->getRequest()->getUriPrefix(); $globals = array( "base" => $relativeUrlRoot ."/images/cal", - 'day_view_action' => $action.'/'.$this->verPorDia, - 'week_view_action' => $action."/".$this->verPorSemana, - 'month_view_action' => $action.'/'.$this->verPorMes, - 'year_view_action' => $action.'/'.$this->verPorAnio, + 'day_view_action' => $url_nueva.'/'.$this->verPorDia, + 'week_view_action' => $url_nueva."/".$this->verPorSemana, + 'month_view_action' => $url_nueva.'/'.$this->verPorMes, + 'year_view_action' => $url_nueva.'/'.$this->verPorAnio, 'version' => $phpicalendar_version, 'charset' => $charset, 'default_path' => '', Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-09-26 19:33:42 UTC (rev 5170) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-09-26 19:36:34 UTC (rev 5171) @@ -86,15 +86,7 @@ $date_component = ""; } - if($this->getRequestParameter('view')) { - switch($this->getRequestParameter('view')) { - case 'week': $view = 'verPorSemana'; break; - case 'day': $view = 'verPorDia'; break; - default: $view = 'verPorDia'; - } - } else { - $view = $vista; - } + $view = $this->getRequestParameter('view', $vista); return array($view, $archivo, $date_component); } 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-09-26 19:33:42 UTC (rev 5170) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-09-26 19:36:34 UTC (rev 5171) @@ -126,17 +126,7 @@ } else { $this->date_component = ""; } - - $this->view = $this->getRequestParameter('view','verPorDia'); -// if($this->getRequestParameter('view')) { -// switch($this->getRequestParameter('view')) { -// case 'week': $this->view = 'verPorSemana'; break; -// case 'day': $this->view = 'verPorDia'; break; -// default: $this->view = 'verPorDia'; -// } -// } else { -// $this->view = "verPorDia"; -// } + $this->view = $this->getRequestParameter('view','verPorDia'); }