Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix "Sub-directory Support" in small steps #12910

Merged
merged 8 commits into from Jun 15, 2021
Merged

Fix "Sub-directory Support" in small steps #12910

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b0561ad
Fix "Sub-directory Support" in small steps
mpikzink May 22, 2021
b507046
Update oxidized.inc.php
mpikzink Jun 10, 2021
ea6e2b6
Update oxidized.inc.php
mpikzink Jun 10, 2021
17f518d
Update oxidized.inc.php
mpikzink Jun 10, 2021
ca1b96c
Update oxidized.inc.php
mpikzink Jun 10, 2021
303d855
Update oxidized.inc.php
mpikzink Jun 10, 2021
fc83c71
Update oxidized.inc.php
mpikzink Jun 13, 2021
bbfce83
Update oxidized.inc.php
mpikzink Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions includes/html/pages/oxidized.inc.php
View file
Open in desktop
Expand Up @@ -82,7 +82,7 @@
formatters: {
"hostname": function(column, row) {
if (row.id) {
return '<a href="/device/device=' + row.id + '">' + row.hostname + '</a>';
return '<a href="<?= url('device') ?>/' + row.id + '">' + row.hostname + '</a>';
} else {
return row.hostname;
}
Expand All @@ -92,7 +92,7 @@
return '<button class="btn btn-default btn-sm" name="btn-refresh-node-devId' + row.id +
'" id="btn-refresh-node-devId' + row.id + '" onclick="refresh_oxidized_node(\'' + row.hostname + '\');" title="Refetch config">' +
'<i class="fa fa-refresh"></i></button> ' +
'<a href="device/device=' + row.id + '/tab=showconfig/" title="View config"><i class="fa fa-align-justify fa-lg icon-theme"></i></a>';
'<a href="<?= url('device') ?>/' + row.id + '/tab=showconfig/" title="View config"><i class="fa fa-align-justify fa-lg icon-theme"></i></a>';
}
},
"status": function(column, row) {
Expand Down Expand Up @@ -121,7 +121,7 @@
$('#search-output').append('<p>Config appears on the following device(s):</p>');
$.each(data.output, function (row, value) {
if (value['dev_id']) {
$('#search-output').append('<p><a href="device/device=' + value['dev_id'] + '/tab=showconfig/">' + value['full_name'] + '</p>');
$('#search-output').append('<p><a href="<?= url('device') ?>/' + value['dev_id'] + '/tab=showconfig/">' + value['full_name'] + '</p>');
} else {
$('#search-output').append('<p>' + value['full_name'] + '</p>');
}
Expand Down