mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Custommap label fixes (#15875)

Browse Source 
* Fixes for the edge label:
 - Hide when editing the default settings
 - Copy the correct value into the textbox when editing

* Show the re-render button when a label is cleared
This commit is contained in:
eskyuu
2024-03-04 19:33:16 +08:00
committed by GitHub
parent 6798a43e4a
commit 22f5b687c4
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
resources/views/map/custom-edit.blade.php
View File

@@ -253,7 +253,7 @@
var mid_x = mid_pos.x;
var mid_y = mid_pos.y;
var mid = {id: edgeid + "_mid", shape: "dot", size: 3, x: mid_x, y: mid_y};
var mid = {id: edgeid + "_mid", shape: "dot", size: 3, x: mid_x, y: mid_y, label: ''};
var edge1 = structuredClone(newedgeconf);
edge1.id = edgeid + "_from";
@@ -854,6 +854,7 @@
$("#edgePortReverseRow").hide();
$("#edgePortSearchRow").hide();
$("#edgeRecenterRow").hide();
$("#edgelabel").hide();
$("#edgestyle").val(newedgeconf.smooth.type);
$("#edgetextface").val(newedgeconf.font.face);
@@ -923,10 +924,12 @@
$("#edgetextcolour").val(edgedata.edge1.font.color);
$("#edgetextshow").bootstrapSwitch('state', (edgedata.edge1.label != null && edgedata.edge1.label.includes('xx%')));
$("#edgebpsshow").bootstrapSwitch('state', (edgedata.edge1.label != null && edgedata.edge1.label.includes('bps')));
$("#edgelabel").val('label' in edgedata.mid ? edgedata.mid.label : '');
$("#edgeRecenterRow").show();
$("#divEdgeFrom").show();
$("#divEdgeTo").show();
$("#edgelabel").show();
$("#edge-saveButton").show();
$("#edge-saveDefaultsButton").hide();
$("#edge-saveButton").on("click", {data: edgedata}, callback);
@@ -949,7 +952,11 @@
edgedata.edge1.font.color = edgedata.edge2.font.color = $("#edgetextcolour").val();
edgedata.edge1.label = edgedata.edge2.label = edgeLabel($("#edgetextshow").prop('checked'), $("#edgebpsshow").prop('checked'), null);
edgedata.edge1.title = edgedata.edge2.title = $("#port_id").val();
edgedata.mid.label = ($("#edgelabel").val() || '');
let newlabel = $("#edgelabel").val() || '';
if (newlabel == '' && edgedata.mid.label != '') {
$("#map-renderButton").show();
}
edgedata.mid.label = newlabel;
if(edgedata.id) {
if($("#port_id").val()) {