Merge branch 'ent-8039-Bug-en-item-Network-link-CV' into 'develop'

Ent 8039 bug en item network link cv

See merge request artica/pandorafms!4453
This commit is contained in:
Daniel Rodriguez 2021-11-15 10:13:44 +00:00
commit 504411d7d2
2 changed files with 21 additions and 3 deletions

View File

@ -306,6 +306,16 @@ foreach ($layoutDatas as $layoutData) {
break; break;
case NETWORK_LINK: case NETWORK_LINK:
$table->data[($i + 1)]['icon'] = html_print_image(
'images/network_link_item.png',
true,
[
'title' => __('Network link'),
'class' => 'invert_filter',
]
);
break;
case LINE_ITEM: case LINE_ITEM:
$table->data[($i + 1)]['icon'] = html_print_image( $table->data[($i + 1)]['icon'] = html_print_image(
'images/line_item.png', 'images/line_item.png',

View File

@ -433,7 +433,10 @@ switch ($activeTab) {
$idsElements = db_get_all_rows_filter( $idsElements = db_get_all_rows_filter(
'tlayout_data', 'tlayout_data',
['id_layout' => $idVisualConsole], ['id_layout' => $idVisualConsole],
['id'] [
'id',
'type',
]
); );
if ($idsElements === false) { if ($idsElements === false) {
@ -449,8 +452,13 @@ switch ($activeTab) {
$values['height'] = get_parameter('height_'.$id, 0); $values['height'] = get_parameter('height_'.$id, 0);
$values['pos_x'] = get_parameter('left_'.$id, 0); $values['pos_x'] = get_parameter('left_'.$id, 0);
$values['pos_y'] = get_parameter('top_'.$id, 0); $values['pos_y'] = get_parameter('top_'.$id, 0);
$type = db_get_value('type', 'tlayout_data', 'id', $id); switch ($idElement['type']) {
switch ($type) { case NETWORK_LINK:
case LINE_ITEM:
continue 2;
break;
case MODULE_GRAPH: case MODULE_GRAPH:
case SIMPLE_VALUE_MAX: case SIMPLE_VALUE_MAX:
case SIMPLE_VALUE_MIN: case SIMPLE_VALUE_MIN: