Skip to content

Commit

Permalink
Merge branch 'release/v3.0.25' into support/v3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
enfoqueNativo committed May 16, 2018
2 parents e692c6a + d506043 commit 437e3cd
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 2 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

[CURRENT](https://github.com/SIU-Toba/framework/compare/master...develop)

[3.0.24](https://github.com/SIU-Toba/framework/releases/tag/v3.0.24) (2018-05-07):
[3.0.25](https://github.com/SIU-Toba/framework/releases/tag/v3.0.25) (2018-05-16):
- Bugfix a ef_multi_check al ser utilizado en un ei_filtro como campo obligatorio
- Ordena la lista de metodos recuperados de una clase registrada como consulta_php

[3.0.24](https://github.com/SIU-Toba/framework/releases/tag/v3.0.24) (2018-05-08):
- Se fixea error en commit anterior y agrega scroll a la operacion de seleccion de usuarios
- Se agrega paginado y se solicita al menos un filtro para la seleccion de usuarios via arai en toba_usuarios
- Se mejora la validacion al agregar o sincronizar proyectos con arai-registry
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.24
3.0.25
2 changes: 2 additions & 0 deletions php/modelo/info/toba_info_editores.php
Original file line number Diff line number Diff line change
Expand Up @@ -1472,6 +1472,8 @@ static function get_metodos_consulta_php($consulta_php, $proyecto=null)
foreach ($metodos as $obj) {
$salida[] = array('metodo' => $obj->getName());
}

$salida = rs_ordenar_por_columna($salida, 'metodo');

//Desregistro el autoload de los puntos de montaje existentes para que no interfieran con el editor.
if (! empty($pm_obj)) {
Expand Down
17 changes: 17 additions & 0 deletions www/js/efs/ef_multi_seleccion.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,18 @@ ef_multi_seleccion.prototype.constructor = ef_multi_seleccion;
return this.get_estado().length;
};

ef_multi_seleccion.prototype.get_contenedor = function() {
var cont = document.getElementById('cont_' + this._id_form);
if (! cont) {
return this.get_contenedor_opciones();
}
return cont;
};

ef_multi_seleccion.prototype.get_contenedor_opciones = function() {
return null;
};


// ########################################################################################################
// ########################################################################################################
Expand Down Expand Up @@ -306,6 +318,11 @@ ef_multi_seleccion_check.constructor = ef_multi_seleccion_check;
return (nodo.style.display == 'none' ); //Evalua unicamente la visibilidad del contenedor
};

ef_multi_seleccion_check.prototype.get_contenedor_opciones = function() {
return document.getElementById(this._id_form + '_opciones');
};


// ########################################################################################################
// ########################################################################################################

Expand Down

0 comments on commit 437e3cd

Please sign in to comment.