Merge branch 'ent-3357-7329-comision-europea-ordenar-consolas-por-nombre-en-metaconsola-y-anadir-buscador' into 'develop'

mc search nodes

See merge request artica/pandorafms!3463
This commit is contained in:
Daniel Rodriguez 2020-09-18 14:37:10 +02:00
commit b18bbbf237
2 changed files with 25 additions and 0 deletions

View File

@ -3548,6 +3548,11 @@ function ui_print_datatable(array $parameters)
$output = $err_msg.$filter.$extra.$table.$js;
ui_require_css_file('datatables.min', 'include/styles/js/');
ui_require_css_file('tables');
if (is_metaconsole()) {
ui_require_css_file('tables_meta', ENTERPRISE_DIR.'/include/styles/');
}
ui_require_javascript_file('datatables.min');
ui_require_javascript_file('buttons.dataTables.min');
ui_require_javascript_file('dataTables.buttons.min');

View File

@ -58,6 +58,26 @@ abstract class Entity
private $enterprise;
/**
* Instances a new object using array definition.
*
* @param string $class_str Class name.
* @param array $data Fields data.
*
* @return object With current definition.
*/
public static function build(string $class_str, array $data=[])
{
$obj = new $class_str();
// Set values.
foreach ($data as $k => $v) {
$obj->{$k}($v);
}
return $obj;
}
/**
* Defines a generic constructor to extract information of the object.
*