April 2009 - Alba-desarrollo - lists.ourproject.org

SVN Alba r6123 - prosistem/alba/trunk/alba/lib/model
by commits＠pressenter.com.ar 24 Apr '09

24 Apr '09

Author: josx Date: 2009-04-24 17:29:17 -0300 (Fri, 24 Apr 2009) New Revision: 6123 Modified: prosistem/alba/trunk/alba/lib/model/DivisionPeer.php Log: Arreglandojoin entre division y anio ordenado Modified: prosistem/alba/trunk/alba/lib/model/DivisionPeer.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/DivisionPeer.php 2009-04-24 20:26:34 UTC (rev 6122) +++ prosistem/alba/trunk/alba/lib/model/DivisionPeer.php 2009-04-24 20:29:17 UTC (rev 6123) @@ -17,10 +17,18 @@ * long as it does not already exist in the output directory. * * @package model - */ + */ class DivisionPeer extends BaseDivisionPeer { + public static function doSelectJoinAnioByOrden(Criteria $c, $con = null, $join_behavior = Criteria::LEFT_JOIN) { +// $c->addAscendingOrderByColumn(AnioPeer::ORDEN); + $c->addAscendingOrderByColumn(AnioPeer::DESCRIPCION); + $c->addAscendingOrderByColumn(DivisionPeer::ORDEN); + $c->addAscendingOrderByColumn(DivisionPeer::DESCRIPCION); + return DivisionPeer::doSelectJoinAnio($c); + } +/* public static function doSelectJoinAnioByOrden(Criteria $c, $con = null) { $c = clone $c; @@ -70,5 +78,6 @@ } return $results; } + */ } // DivisionPeer

1 0

SVN Alba r6122 - prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates
by commits＠pressenter.com.ar 24 Apr '09

24 Apr '09

Author: hsanchez Date: 2009-04-24 17:26:34 -0300 (Fri, 24 Apr 2009) New Revision: 6122 Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php Log: Fix hasError Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php 2009-04-24 20:03:00 UTC (rev 6121) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php 2009-04-24 20:26:34 UTC (rev 6122) @@ -25,17 +25,7 @@ <?php include_partial('alumno/edit_header', array('alumno' => $alumno)) ?> </div> - - <?php if ($sf_request->hasErrors()): ?> - <div class="form-errors"> - <h2><?php echo __('There are some errors that prevent the form to validate') ?></h2> - <ul> - <?php foreach ($sf_request->getErrorNames() as $name): ?> - <li><?php echo $sf_request->getError($name) ?></li> - <?php endforeach; ?> - </ul> - </div> - <?php elseif ($sf_user->hasFlash('notice')): ?> + <?php if ($sf_user->hasFlash('notice')): ?> <div class="save-ok"> <h2><?php echo __($sf_user->getFlash('notice')) ?></h2> </div> @@ -63,8 +53,8 @@ <div class="form-row"> <?php echo label_for('alumno[apellido_materno]', __('Apellido Materno:'), '') ?> - <div class="content<?php if ($sf_request->haserror('alumno{apellido_materno}')): ?> form-error<?php endif; ?>"> - <?php if ($sf_request->haserror('alumno{apellido_materno}')): ?> + <div class="content<?php if ($sf_request->hasError('alumno{apellido_materno}')): ?> form-error<?php endif; ?>"> + <?php if ($sf_request->hasError('alumno{apellido_materno}')): ?> <?php echo form_error('alumno{apellido_materno}', array('class' => 'form-error-msg')) ?> <?php endif; ?> @@ -118,7 +108,7 @@ <?php echo label_for('alumno[nro_documento]', __('Nro. Documento:'), 'class="required" ') ?> <div class="content<?php if ($sf_request->hasError('alumno{nro_documento}')): ?> form-error<?php endif; ?>"> <?php if ($sf_request->hasError('alumno{nro_documento}')): ?> - <?php echo form_error('alumno{nro_documento}', array('class' => 'form-error-msg')) ?> + <?php echo form_error('alumno{nro_documento}', array('class' => 'form-error-msg')) ?> <?php endif; ?> <?php echo object_input_tag($alumno, 'getNroDocumento', array ( @@ -257,8 +247,6 @@ </div> </div> </div> - - <div class="form-row"> <?php echo label_for('alumno[codigo_postal]', __('CP:'), 'class="required" ') ?> <div class="content<?php if ($sf_request->hasError('alumno{codigo_postal}')): ?> form-error<?php endif; ?>">

1 0

SVN Alba r6121 - prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions
by commits＠pressenter.com.ar 24 Apr '09

24 Apr '09

Author: josx Date: 2009-04-24 17:03:00 -0300 (Fri, 24 Apr 2009) New Revision: 6121 Modified: prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php Log: Sacando strict standars de responsable Modified: prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php 2009-04-24 19:45:53 UTC (rev 6120) +++ prosistem/alba/trunk/alba/apps/principal/modules/responsable/actions/actions.class.php 2009-04-24 20:03:00 UTC (rev 6121) @@ -42,7 +42,7 @@ $c->addDescendingOrderByColumn($sort_column); } } - public function executeEdit (){ + public function executeEdit ($request){ $this->responsable = $this->getResponsableOrCreate(); $datosCuenta = "";

1 0

SVN Alba r6120 - prosistem/alba/trunk/alba/apps/principal/modules/informes/actions
by commits＠pressenter.com.ar 24 Apr '09

24 Apr '09

Author: josx Date: 2009-04-24 16:45:53 -0300 (Fri, 24 Apr 2009) New Revision: 6120 Modified: prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/actions.class.php Log: Cambiando lo que envia en content-type cunado manda los headers en los informes Modified: prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/actions.class.php 2009-04-24 19:44:03 UTC (rev 6119) +++ prosistem/alba/trunk/alba/apps/principal/modules/informes/actions/actions.class.php 2009-04-24 19:45:53 UTC (rev 6120) @@ -458,8 +458,8 @@ $OOo->SaveXmlToDoc(); // OJO hay headers locos para que funcione en internet explorer - // header('Content-type: '.$OOo->GetMimetypeDoc()); - header("Content-Type: application/force-download"); //para que funcione en konqueror + header('Content-type: '.$OOo->GetMimetypeDoc()); + //header("Content-Type: application/force-download"); //para que funcione en konqueror header("Cache-Control: public, must-revalidate"); header("Pragma: hack"); header('Content-Length: '.filesize($OOo->GetPathnameDoc()));

1 0

SVN Alba r6119 - prosistem/alba/trunk/alba/apps/principal/templates
by commits＠pressenter.com.ar 24 Apr '09

24 Apr '09

Author: ftoledo Date: 2009-04-24 16:44:03 -0300 (Fri, 24 Apr 2009) New Revision: 6119 Added: prosistem/alba/trunk/alba/apps/principal/templates/_flashes.php Log: flashes! Added: prosistem/alba/trunk/alba/apps/principal/templates/_flashes.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/_flashes.php (rev 0) +++ prosistem/alba/trunk/alba/apps/principal/templates/_flashes.php 2009-04-24 19:44:03 UTC (rev 6119) @@ -0,0 +1,7 @@ +<?php if ($sf_user->hasFlash('notice')): ?> + <div class="notice"><?php echo __($sf_user->getFlash('notice'), array(), 'sf_admin') ?></div> +<?php endif; ?> + +<?php if ($sf_user->hasFlash('error')): ?> + <div class="error"><?php echo __($sf_user->getFlash('error'), array(), 'sf_admin') ?></div> +<?php endif; ?>

1 0

SVN Alba r6118 - prosistem/alba/trunk/alba/lib/model
by commits＠pressenter.com.ar 24 Apr '09

24 Apr '09

Author: josx Date: 2009-04-24 16:39:22 -0300 (Fri, 24 Apr 2009) New Revision: 6118 Modified: prosistem/alba/trunk/alba/lib/model/Alumno.php Log: Modificando modelo del alumno Modified: prosistem/alba/trunk/alba/lib/model/Alumno.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/Alumno.php 2009-04-24 19:26:47 UTC (rev 6117) +++ prosistem/alba/trunk/alba/lib/model/Alumno.php 2009-04-24 19:39:22 UTC (rev 6118) @@ -29,26 +29,27 @@ $result = array( $keys[0] => $this->getId(), $keys[1] => $this->getNombre(), - $keys[2] => $this->getApellido(), - $keys[3] => $this->getFechaNacimiento(), - $keys[4] => $this->getDireccion(), - $keys[5] => $this->getCiudad(), - $keys[6] => $this->getCodigoPostal(), + $keys[2] => $this->getApellidoMaterno(), + $keys[3] => $this->getApellido(), + $keys[4] => $this->getFechaNacimiento(), + $keys[5] => $this->getDireccion(), + $keys[6] => $this->getCiudad(), + $keys[7] => $this->getCodigoPostal(), 'Provincia' => ($this->getProvincia())?$this->getProvincia()->getNombreCorto():'' , - $keys[8] => $this->getTelefono(), - $keys[9] => $this->getLugarNacimiento(), + $keys[9] => $this->getTelefono(), + $keys[10] => $this->getLugarNacimiento(), 'TipoDocumento' => ($this->getTipodocumento())?$this->getTipodocumento()->getNombre():'', - $keys[11] => $this->getNroDocumento(), - $keys[12] => $this->getSexo(), - $keys[13] => $this->getEmail(), - $keys[14] => $this->getDistanciaEscuela(), - $keys[15] => $this->getHermanosEscuela(), - $keys[16] => $this->getHijoMaestroEscuela(), + $keys[12] => $this->getNroDocumento(), + $keys[13] => $this->getSexo(), + $keys[14] => $this->getEmail(), + $keys[15] => $this->getDistanciaEscuela(), + $keys[16] => $this->getHermanosEscuela(), + $keys[17] => $this->getHijoMaestroEscuela(), 'Establecimiento' => ($this->getEstablecimiento())?$this->getEstablecimiento()->getNombre():'', 'Cuenta' => ($this->getCuenta())?$this->getCuenta()->getNombre():'', - $keys[19] => $this->getCertificadoMedico(), - $keys[20] => $this->getActivo(), - $keys[21] => $this->getFkConceptobajaId(), + $keys[20] => $this->getCertificadoMedico(), + $keys[21] => $this->getActivo(), + $keys[22] => $this->getFkConceptobajaId(), 'Pais' => ($this->getPais())?$this->getPais()->getNombreLargo():'', ); return $result;

1 0

SVN Alba r6117 - in prosistem/alba/trunk/alba/apps/principal/modules: ciclolectivo/actions feriado/actions usuario/actions
by commits＠pressenter.com.ar 24 Apr '09

24 Apr '09

Author: hsanchez Date: 2009-04-24 16:26:47 -0300 (Fri, 24 Apr 2009) New Revision: 6117 Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php Log: cambios del request Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2009-04-24 19:01:03 UTC (rev 6116) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2009-04-24 19:26:47 UTC (rev 6117) @@ -81,14 +81,14 @@ } - public function executeDeleteTurno () { + public function executeDeleteTurno ($request) { $this->turnos = TurnoPeer::retrieveByPk($this->getRequestParameter('idTurno')); $this->forward404Unless($this->turnos); $this->turnos->delete(); return $this->forward('ciclolectivo','agregarTurnosYPeriodos','id/'.$this->getRequestParameter('id')); } - public function executeDeletePeriodo () { + public function executeDeletePeriodo ($request) { $this->periodo = PeriodoPeer::retrieveByPk($this->getRequestParameter('idPeriodo')); $this->forward404Unless($this->periodo); $this->periodo->delete(); @@ -197,44 +197,37 @@ return $string; } - protected function addFiltersCriteria($c) - { - - $c->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getAttribute('fk_establecimiento_id')); + protected function addFiltersCriteria($c){ + $c->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getAttribute('fk_establecimiento_id')); } - protected function saveCiclolectivo($ciclolectivo) - { - //si se guarda el ciclo y se marca como actual - //los demas ciclo del establecimiento tiene que quedar como ACUAL = false - // $con = sfContext::getInstance()->getDatabaseConnection('propel'); -// new sfUser(); // nasty hack to load propel + protected function saveCiclolectivo($ciclolectivo) { + //si se guarda el ciclo y se marca como actual + //los demas ciclo del establecimiento tiene que quedar como ACUAL = false - $con = Propel::getConnection(); - try { - $con->beginTransaction(); - if ($ciclolectivo->getActual()) { - $c1 = new Criteria(); - $c1->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID,$this->getUser()->getAttribute('fk_establecimiento_id')); - $c2 = new Criteria(); - $c2->add(CiclolectivoPeer::ACTUAL,false); - BasePeer::doUpdate($c1,$c2,$con); - - } + $con = Propel::getConnection(); + try { + $con->beginTransaction(); + if ($ciclolectivo->getActual()) { + $c1 = new Criteria(); + $c1->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID,$this->getUser()->getAttribute('fk_establecimiento_id')); + $c2 = new Criteria(); + $c2->add(CiclolectivoPeer::ACTUAL,false); + BasePeer::doUpdate($c1,$c2,$con); + } $ciclolectivo->setFkEstablecimientoId($this->getUser()->getAttribute('fk_establecimiento_id')); - $ciclolectivo->save(); - $con->commit(); + $ciclolectivo->save(); + $con->commit(); - //cambio el attributo porque se cambio el ciclo actual - $this->getUser()->setAttribute('fk_ciclolectivo_id',$ciclolectivo->getId()); - $this->getUser()->setAttribute('ciclolectivo_descripcion',$ciclolectivo->getDescripcion()); - - } - catch (Exception $e){ - $con->rollBack(); - throw $e; - } - } + //cambio el attributo porque se cambio el ciclo actual + $this->getUser()->setAttribute('fk_ciclolectivo_id',$ciclolectivo->getId()); + $this->getUser()->setAttribute('ciclolectivo_descripcion',$ciclolectivo->getDescripcion()); + } + catch (Exception $e){ + $con->rollBack(); + throw $e; + } + } /** * Cambia el ciclo lectivo actual @@ -287,7 +280,7 @@ return $this->redirect('ciclolectivo/list'); } - function validateDelete() { + function validateDelete($request) { $this->ciclolectivo = CiclolectivoPeer::retrieveByPk($this->getRequestParameter('id')); $this->forward404Unless($this->ciclolectivo); if ($this->ciclolectivo->countTurnos() >0) { @@ -303,9 +296,9 @@ return false; } - return true; + return true; } - + public function executeSinciclolectivo() { $this->modulo = $this->getRequestParameter('m'); } @@ -361,10 +354,6 @@ } $this->ciclolectivo->setActual(isset($ciclolectivo['actual']) ? $ciclolectivo['actual'] : 0); } - - - - } ?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php 2009-04-24 19:01:03 UTC (rev 6116) +++ prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php 2009-04-24 19:26:47 UTC (rev 6117) @@ -43,7 +43,7 @@ Sobreescribo la accion del generator porque nefecito que el combo del ciclo lectivo sea dependiente de la session fk_establecimiento_id */ - public function executeEdit () + public function executeEdit ($request) { $this->feriado = $this->getFeriadoOrCreate(); $criteria = new Criteria(); @@ -125,4 +125,4 @@ } -?> \ No newline at end of file +?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php 2009-04-24 19:01:03 UTC (rev 6116) +++ prosistem/alba/trunk/alba/apps/principal/modules/usuario/actions/actions.class.php 2009-04-24 19:26:47 UTC (rev 6117) @@ -77,7 +77,7 @@ } - public function executeDelete() { + public function executeDelete($request) { $this->usuario = UsuarioPeer::retrieveByPk($this->getRequestParameter('id')); $this->forward404Unless($this->usuario); $this->usuario->setBorrado(1); @@ -86,7 +86,7 @@ } - public function executeList() { + public function executeList($request) { $this->processSort(); $this->processFilters(); $this->filters = $this->getUser()->getAttributeHolder()->getAll('sf_admin/usuario/filters'); @@ -106,7 +106,7 @@ - function executeEditPermiso() { + function executeEditPermiso($request) { // estos son los permisos que tiene el usuario $c = new Criteria(); @@ -158,7 +158,7 @@ $this->usuario = UsuarioPeer::retrieveByPk($this->getRequestParameter('id')); } - function executeSavePermiso() { + function executeSavePermiso($request) { // borrar todo los permisos para un usuarios determinado $usuarioId = $this->getRequestParameter('id');

1 0

SVN Alba r6116 - in prosistem/alba/trunk/alba/apps/principal: config modules/ciclolectivo/actions
by commits＠pressenter.com.ar 24 Apr '09

24 Apr '09

Author: ftoledo Date: 2009-04-24 16:01:03 -0300 (Fri, 24 Apr 2009) New Revision: 6116 Removed: prosistem/alba/trunk/alba/apps/principal/config/config.php Modified: prosistem/alba/trunk/alba/apps/principal/config/settings.yml prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php Log: error de condificacion sobre firefox parece que FF tiene unbug y no detecta bien la compresion que envia el SF Deleted: prosistem/alba/trunk/alba/apps/principal/config/config.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/config/config.php 2009-04-24 18:59:03 UTC (rev 6115) +++ prosistem/alba/trunk/alba/apps/principal/config/config.php 2009-04-24 19:01:03 UTC (rev 6116) @@ -1,13 +0,0 @@ -<?php - -// include project configuration -include(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php'); - -// symfony bootstraping -require_once($sf_symfony_lib_dir.'/util/sfCore.class.php'); -sfCore::bootstrap($sf_symfony_lib_dir, $sf_symfony_data_dir); - -sfConfig::add(array( - 'sf_informe_dir_name' => $sf_informe_dir_name = 'informes', - 'sf_informe_dir' => sfConfig::get('sf_root_dir').DIRECTORY_SEPARATOR.sfConfig::get('sf_web_dir_name').DIRECTORY_SEPARATOR.sfConfig::get('sf_upload_dir_name').DIRECTORY_SEPARATOR.$sf_informe_dir_name -)); \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/config/settings.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/config/settings.yml 2009-04-24 18:59:03 UTC (rev 6115) +++ prosistem/alba/trunk/alba/apps/principal/config/settings.yml 2009-04-24 19:01:03 UTC (rev 6116) @@ -71,7 +71,7 @@ # # use_security: on # - compressed: on +# compressed: on # # tidy: on # Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2009-04-24 18:59:03 UTC (rev 6115) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2009-04-24 19:01:03 UTC (rev 6116) @@ -268,7 +268,7 @@ * Elimino el ciclo lectivo si es el actual * el usuario debe quedar con ciclolectivo "No seleccionado" */ - public function executeDelete() { + public function executeDelete($request) { $this->ciclolectivo = CiclolectivoPeer::retrieveByPk($this->getRequestParameter('id')); $this->forward404Unless($this->ciclolectivo);

1 0

SVN Alba r6115 - in prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision: actions templates
by commits＠pressenter.com.ar 24 Apr '09

24 Apr '09

Author: josx Date: 2009-04-24 15:59:03 -0300 (Fri, 24 Apr 2009) New Revision: 6115 Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_listado_alumnos.php prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_listado_divisiones.php prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/editSuccess.php Log: Agregando helpers de javascript y form a varios templates y sacando el molesto error de strict standars Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php 2009-04-24 18:51:34 UTC (rev 6114) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php 2009-04-24 18:59:03 UTC (rev 6115) @@ -181,7 +181,7 @@ } - function executeEdit() { + function executeEdit($request) { //Listado de alumnos $c = new Criteria(); $aAlumno = AlumnoPeer::doSelect($c); @@ -247,7 +247,7 @@ } - public function executeDelete(){ + public function executeDelete($request) { $aAlumno = $this->getRequest()->getParameterHolder()->get('alumno'); $division_id = $this->getRequestParameter('division_id'); Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_listado_alumnos.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_listado_alumnos.php 2009-04-24 18:51:34 UTC (rev 6114) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_listado_alumnos.php 2009-04-24 18:59:03 UTC (rev 6115) @@ -1,4 +1,4 @@ -<?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date') ?> +<?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date', 'Form', 'Javascript') ?> <?php if(count($optionsAlumno) > 0) { ?> <table cellspacing="0"> @@ -26,4 +26,4 @@ <?php } else { ?> No se encontraron coincidencias -<?php } ?> \ No newline at end of file +<?php } ?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_listado_divisiones.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_listado_divisiones.php 2009-04-24 18:51:34 UTC (rev 6114) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_listado_divisiones.php 2009-04-24 18:59:03 UTC (rev 6115) @@ -1,4 +1,4 @@ -<?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date') ?> +<?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date', 'Form', 'Javascript') ?> <?php if(count($optionsDivision) > 0) { ?> <table> Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/editSuccess.php 2009-04-24 18:51:34 UTC (rev 6114) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/editSuccess.php 2009-04-24 18:59:03 UTC (rev 6115) @@ -1,4 +1,4 @@ -<?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date') ?> +<?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date','Form', 'Javascript') ?> <?php use_stylesheet('/sf/sf_admin/css/main') ?> <?php use_stylesheet('cart') ?> <div id="sf_admin_container"> @@ -65,4 +65,4 @@ <?php include_partial('relAlumnoDivision/listado_divisiones', array('optionsDivision' => $optionsDivision, 'alumnoDivision' => $alumnoDivision )) ?> </div> -</div> \ No newline at end of file +</div>

1 0

SVN Alba r6114 - in prosistem/alba/trunk/alba/web: . css
by commits＠pressenter.com.ar 24 Apr '09

24 Apr '09

Author: ftoledo Date: 2009-04-24 15:51:34 -0300 (Fri, 24 Apr 2009) New Revision: 6114 Modified: prosistem/alba/trunk/alba/web/css/main.css prosistem/alba/trunk/alba/web/principal_demo.php prosistem/alba/trunk/alba/web/principal_dev.php Log: arreglando controladores y fix comentario en el css Modified: prosistem/alba/trunk/alba/web/css/main.css =================================================================== --- prosistem/alba/trunk/alba/web/css/main.css 2009-04-24 18:26:47 UTC (rev 6113) +++ prosistem/alba/trunk/alba/web/css/main.css 2009-04-24 18:51:34 UTC (rev 6114) @@ -91,7 +91,7 @@ float: right; margin-top: 8px; position: relative; -// left: 200px; - // top: 10px; +/* left: 200px; */ + /* top: 10px; */ width: 250px; } \ No newline at end of file Modified: prosistem/alba/trunk/alba/web/principal_demo.php =================================================================== --- prosistem/alba/trunk/alba/web/principal_demo.php 2009-04-24 18:26:47 UTC (rev 6113) +++ prosistem/alba/trunk/alba/web/principal_demo.php 2009-04-24 18:51:34 UTC (rev 6114) @@ -1,22 +1,12 @@ <?php +// this check prevents access to debug front conrollers that are deployed by accident to production servers. +// feel free to remove this, extend it or make something more sophisticated. +if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1'))) +{ + die('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); +} -define('SF_ROOT_DIR', realpath(dirname(__FILE__).'/..')); -define('SF_APP', 'principal'); -define('SF_ENVIRONMENT', 'demo'); -define('SF_DEBUG', false); - -require_once(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.SF_APP.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php'); - -sfContext::getInstance()->getController()->dispatch(); - - - -/* -<?php -##IP_CHECK## require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php'); $configuration = ProjectConfiguration::getApplicationConfiguration('principal', 'demo', false); sfContext::createInstance($configuration)->dispatch(); - -*/ Modified: prosistem/alba/trunk/alba/web/principal_dev.php =================================================================== --- prosistem/alba/trunk/alba/web/principal_dev.php 2009-04-24 18:26:47 UTC (rev 6113) +++ prosistem/alba/trunk/alba/web/principal_dev.php 2009-04-24 18:51:34 UTC (rev 6114) @@ -1,7 +1,12 @@ <?php +// this check prevents access to debug front conrollers that are deployed by accident to production servers. +// feel free to remove this, extend it or make something more sophisticated. +if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1'))) +{ + die('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); +} require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php'); + $configuration = ProjectConfiguration::getApplicationConfiguration('principal', 'dev', true); sfContext::createInstance($configuration)->dispatch(); - -

1 0