Author: ftoledo Date: 2007-01-12 10:54:04 -0300 (Fri, 12 Jan 2007) New Revision: 4005 Modified: prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/verCompletaSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/provincia/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/usuario/config/generator.yml Log: Ordenes x defecto Modified: prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php 2007-01-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php 2007-01-12 13:54:04 UTC (rev 4005) @@ -30,11 +30,9 @@ * @license GPL */ -class actividadActions extends autoactividadActions -{ +class actividadActions extends autoactividadActions { protected function addFiltersCriteria (&$c) { $c->add(ActividadPeer::FK_ESTABLECIMIENTO_ID,$this->getUser()->getAttribute('fk_establecimiento_id')); - } protected function SaveActividad ($actividad) { @@ -42,6 +40,17 @@ $actividad->setFkEstablecimientoId($this->getUser()->getAttribute('fk_establecimiento_id')); $actividad->save(); } + protected function addSortCriteria (&$c) { + if ($sort_column = $this->getUser()->getAttribute('sort', 'nombre', 'sf_admin/actividad/sort')) { + $sort_column = Propel::getDB($c->getDbName())->quoteIdentifier($sort_column); + if ($this->getUser()->getAttribute('type', 'asc', 'sf_admin/actividad/sort') == 'asc') { + $c->addAscendingOrderByColumn($sort_column); + } + else { + $c->addDescendingOrderByColumn($sort_column); + } + } + } } -?> +?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php 2007-01-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php 2007-01-12 13:54:04 UTC (rev 4005) @@ -99,7 +99,17 @@ } - + protected function addSortCriteria (&$c) { + if ($sort_column = $this->getUser()->getAttribute('sort', null, 'sf_admin/alumno/sort')) { + $sort_column = Propel::getDB($c->getDbName())->quoteIdentifier($sort_column); + if ($this->getUser()->getAttribute('type', null, 'sf_admin/alumno/sort') == 'asc') { + $c->addAscendingOrderByColumn($sort_column); + } + else { + $c->addDescendingOrderByColumn($sort_column); + } + } + } } ?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/verCompletaSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/verCompletaSuccess.php 2007-01-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/verCompletaSuccess.php 2007-01-12 13:54:04 UTC (rev 4005) @@ -135,7 +135,7 @@ <td><?echo $responsable->getDireccion();?></td> <td><?echo $responsable->getCiudad();?></td> <td><?echo $responsable->getRelacion();?></td> - <td><?echo $responsable->getAutorizacionRetiro();?></td> + <td><?echo $responsable->getAutorizacionRetiro() == 1 ? "Si" : "No";?></td> <td><?echo $responsable->getTelefono();?></td> <td> <ul class="sf_admin_td_actions"> Modified: prosistem/alba/trunk/alba/apps/principal/modules/provincia/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/provincia/config/generator.yml 2007-01-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/provincia/config/generator.yml 2007-01-12 13:54:04 UTC (rev 4005) @@ -15,7 +15,7 @@ list: title: Listado de Provincias - display: [ =nombre_corto, nombre_largo, _pais ] + display: [ =nombre_corto, nombre_largo, _pais, orden ] object_actions: _edit: - _delete: - Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php 2007-01-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php 2007-01-12 13:54:04 UTC (rev 4005) @@ -31,6 +31,16 @@ * @license GPL */ -class tipodocumentoActions extends autotipodocumentoActions -{ +class tipodocumentoActions extends autotipodocumentoActions { + protected function addSortCriteria (&$c) { + if ($sort_column = $this->getUser()->getAttribute('sort', 'nombre', 'sf_admin/tipodocumento/sort')) { + $sort_column = Propel::getDB($c->getDbName())->quoteIdentifier($sort_column); + if ($this->getUser()->getAttribute('type', 'asc', 'sf_admin/tipodocumento/sort') == 'asc') { + $c->addAscendingOrderByColumn($sort_column); + } + else { + $c->addDescendingOrderByColumn($sort_column); + } + } + } } Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/config/generator.yml 2007-01-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/config/generator.yml 2007-01-12 13:54:04 UTC (rev 4005) @@ -7,11 +7,9 @@ id: { name: identificador } nombre: { name: Nombre , params: size=64 } descripcion: { name: Descripción , params: size=64 } - edit: title: Modificar Tipo de Documento display: [nombre, descripcion, orden] - list: display: [=nombre, descripcion, orden] title: Listado de Tipo de Documento Modified: prosistem/alba/trunk/alba/apps/principal/modules/usuario/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/usuario/config/generator.yml 2007-01-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/usuario/config/generator.yml 2007-01-12 13:54:04 UTC (rev 4005) @@ -19,7 +19,10 @@ edit: title: Modificar Usuario - display: [usuario, _clave, correo_publico, email, activo, fecha_creado, fecha_actualizado, seguridad_pregunta, seguridad_respuesta, fk_establecimiento_id] + display: + "General": [usuario, _clave, correo_publico, email, activo, fecha_creado, fecha_actualizado, fk_establecimiento_id] + "Si olvida su clave se le realizará un pregunta se seguridad" : [seguridad_pregunta] + "Deberá ingresar una respuesta para validarla " : [seguridad_respuesta] fields: fecha_creado: {type: plain} fecha_actualizado: {type: plain }