Skip to content

Commit a054334

Browse files
authored
Merge pull request #21 from k01ek/nb3u
NetBox 3.0 support
2 parents d4195d4 + a85ba97 commit a054334

File tree

4 files changed

+33
-6
lines changed

4 files changed

+33
-6
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
PYTHON_VER?=3.7
2-
NETBOX_VER?=v2.11.6
3-
2+
NETBOX_VER?=v3.0.7
43

54
NAME=netbox-qrcode
65

netbox_qrcode/template_content.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
from packaging import version
12

3+
from django.conf import settings
24
from django.core.exceptions import ObjectDoesNotExist
5+
36
from extras.plugins import PluginTemplateExtension
47

58
from .utilities import get_img_b64, get_qr, get_qr_text, get_concat
@@ -54,9 +57,14 @@ def x_page(self):
5457
else:
5558
img = get_img_b64(qr_img)
5659
try:
57-
return self.render(
58-
'netbox_qrcode/qrcode.html', extra_context={'image': img}
59-
)
60+
if version.parse(settings.VERSION).major >= 3:
61+
return self.render(
62+
'netbox_qrcode/qrcode3.html', extra_context={'image': img}
63+
)
64+
else:
65+
return self.render(
66+
'netbox_qrcode/qrcode.html', extra_context={'image': img}
67+
)
6068
except ObjectDoesNotExist:
6169
return ''
6270

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<script type="text/javascript">
2+
function printImg(source) {
3+
var win = window.open('');
4+
win.document.write('<img src="' + source + '" onload="window.print();window.close()" />');
5+
win.focus();
6+
}
7+
</script>
8+
<div class="card">
9+
<h5 class="card-header">
10+
QR Code
11+
</h5>
12+
<div class="card-body text-right noprint">
13+
<img src="data:image/png;base64,{{image}}" />
14+
</div>
15+
<div class="card-footer text-end noprint">
16+
<button onclick="printImg('data:image/png;base64,{{image}}')" ; class="btn btn-xs btn-primary">
17+
<span class="mdi mdi-printer" aria-hidden="true"></span> Print
18+
</button>
19+
</div>
20+
</div>

netbox_qrcode/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.0.6"
1+
__version__ = "0.0.7"

0 commit comments

Comments
 (0)