tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8041-Bug-en-item-Module-graph-CV-creados-desde-wizard' into 'develop' 

Ent 8041 bug en item module graph cv creados desde wizard

See merge request artica/pandorafms!4471
This commit is contained in:
Daniel Rodriguez 2021-11-15 11:21:44 +00:00
parent 4eb40382dd 9976783266
commit a6fc887613
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
View File

@ -327,6 +327,10 @@ final class ModuleGraph extends Item
$width = (int) $data['width']; $width = (int) $data['width'];
$height = (int) $data['height']; $height = (int) $data['height'];
if ($height == 0) {
$height = 15;
}
// Custom graph. // Custom graph.
if (empty($customGraphId) === false) { if (empty($customGraphId) === false) {
$customGraph = \db_get_row('tgraph', 'id_graph', $customGraphId); $customGraph = \db_get_row('tgraph', 'id_graph', $customGraphId);

14
visual_console_client/src/items/ModuleGraph.ts
View File

@ -88,12 +88,6 @@ export function moduleGraphPropsDecoder(
export default class ModuleGraph extends Item<ModuleGraphProps> { export default class ModuleGraph extends Item<ModuleGraphProps> {
protected createDomElement(): HTMLElement { protected createDomElement(): HTMLElement {
const element = document.createElement("div"); const element = document.createElement("div");
//element.className = "module-graph";
//element.style.backgroundImage = `url(${this.props.html})`;
//element.style.backgroundRepeat = "no-repeat";
//element.style.backgroundSize = `${this.props.width}px ${
// this.props.height
//}px`;
element.innerHTML = this.props.html; element.innerHTML = this.props.html;
element.className = "module-graph"; element.className = "module-graph";
@ -128,18 +122,10 @@ export default class ModuleGraph extends Item<ModuleGraphProps> {
} }
} }
// element.innerHTML = this.props.html;
return element; return element;
} }
protected updateDomElement(element: HTMLElement): void { protected updateDomElement(element: HTMLElement): void {
//element.style.backgroundImage = `url(${this.props.html})`;
//element.style.backgroundRepeat = "no-repeat";
//element.style.backgroundSize = `${this.props.width}px ${
// this.props.height
//}px`;
element.innerHTML = this.props.html; element.innerHTML = this.props.html;
// Remove the overview graph. // Remove the overview graph.