Skip to content

Commit 8ee7dd5

Browse files
nemesifiernemesifier
authored
Merge branch 'master' into add-tiny
2 parents c4ed204 + 5243219 commit 8ee7dd5

16 files changed

+96
-88
lines changed

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
pip install -U -r requirements-test.txt
5656
pip install -U -e .
5757
pip install -U ${{ matrix.django-version }}
58-
sudo npm install -g jshint stylelint
58+
sudo npm install -g prettier
5959
6060
- name: QA checks
6161
run: |

‎.github/workflows/pypi.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ jobs:
2929
- name: Build package
3030
run: python -m build
3131
- name: Publish package distributions to PyPI
32-
uses: pypa/gh-action-pypi-publish@v1.11.0
32+
uses: pypa/gh-action-pypi-publish@v1.12.3

‎.github/workflows/version-branch.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Replicate Commits to Version Branch
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
version-branch:
10+
uses: openwisp/openwisp-utils/.github/workflows/reusable-version-branch.yml@master
11+
with:
12+
module_name: openwisp_firmware_upgrader

‎.jshintrc

-22
This file was deleted.

‎CHANGES.rst

+15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
Changelog
22
=========
33

4+
Version 1.2.0 [Unreleased]
5+
--------------------------
6+
7+
Work in progress.
8+
9+
Version 1.1.1 [2025-01-31]
10+
--------------------------
11+
12+
Bugfixes
13+
~~~~~~~~
14+
15+
- Fixed `"test_restoring_deleted_device" test
16+
<https://github.com/openwisp/openwisp-firmware-upgrader/pull/287>`_
17+
which was failing due to changes in ``openwisp-controller~=1.1.1``.
18+
419
Version 1.1.0 [2024-11-22]
520
--------------------------
621

‎docs/developer/installation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Install development dependencies:
6666
6767
pip install -e .
6868
pip install -r requirements-test.txt
69-
sudo npm install -g jshint stylelint
69+
sudo npm install -g prettier
7070
7171
Install WebDriver for Chromium for your browser version from
7272
https://chromedriver.chromium.org/home and Extract ``chromedriver`` to one

‎openwisp_firmware_upgrader/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = (1, 1, 0, 'final')
1+
VERSION = (1, 2, 0, 'alpha')
22
__version__ = VERSION # alias
33

44

‎openwisp_firmware_upgrader/static/firmware-upgrader/css/upgrade-options.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#main div[id*=upgrade_options_jsoneditor] .controls {
1+
#main div[id*="upgrade_options_jsoneditor"] .controls {
22
display: none;
33
}
44
.field-readonly_upgrade_options .readonly-upgrade-options {

‎openwisp_firmware_upgrader/static/firmware-upgrader/css/upgrade-selected-confirmation.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ form .errorlist {
77
.errorlist > li {
88
visibility: hidden;
99
}
10-
.errorlist ul li{
10+
.errorlist ul li {
1111
visibility: visible;
1212
}
1313
#ow-loading {

‎openwisp_firmware_upgrader/static/firmware-upgrader/js/build.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
'use strict';
1+
"use strict";
22

33
django.jQuery(function ($) {
4-
function initSelect2() {
5-
$('select[id^="id_firmwareimage_set"][id$="type"]')
6-
.not('select[name*="__prefix__"]')
7-
.select2();
8-
}
9-
$('.add-row > a').click(initSelect2);
10-
initSelect2();
4+
function initSelect2() {
5+
$('select[id^="id_firmwareimage_set"][id$="type"]')
6+
.not('select[name*="__prefix__"]')
7+
.select2();
8+
}
9+
$(".add-row > a").click(initSelect2);
10+
initSelect2();
1111
});

‎openwisp_firmware_upgrader/static/firmware-upgrader/js/device-firmware.js

+37-32
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,42 @@
1-
'use strict';
1+
"use strict";
22

33
django.jQuery(function ($) {
4-
if(firmwareUpgraderSchema === null) {
4+
if (firmwareUpgraderSchema === null) {
5+
return;
6+
}
7+
var firmwareImageChanged = false;
8+
// Do not render JSONSchema form if the image field is not changed.
9+
// The "change" event is also emitted when the form is rendered.
10+
// The "firmwareImageChanged" variable is used as flag to prevent this
11+
// behavior.
12+
if (
13+
$("#id_devicefirmware-0-upgrade_options").val() &&
14+
$("#id_devicefirmware-0-upgrade_options").val() !== "null"
15+
) {
16+
firmwareImageChanged = true;
17+
}
18+
$("#devicefirmware-group").on(
19+
"change",
20+
"#id_devicefirmware-0-image",
21+
function (event) {
22+
if (!$(event.target).val()) {
23+
$("#id_devicefirmware-0-upgrade_options_jsoneditor").hide();
524
return;
6-
}
7-
var firmwareImageChanged = false;
8-
// Do not render JSONSchema form if the image field is not changed.
9-
// The "change" event is also emitted when the form is rendered.
10-
// The "firmwareImageChanged" variable is used as flag to prevent this
11-
// behavior.
12-
if (
13-
$('#id_devicefirmware-0-upgrade_options').val() && $('#id_devicefirmware-0-upgrade_options').val() !== 'null'
14-
) {
25+
}
26+
$("#id_devicefirmware-0-upgrade_options_jsoneditor").show();
27+
if (firmwareImageChanged) {
28+
django._loadJsonSchemaUi(
29+
$("#id_devicefirmware-0-upgrade_options").get(0),
30+
false,
31+
firmwareUpgraderSchema,
32+
true,
33+
);
34+
} else {
1535
firmwareImageChanged = true;
16-
}
17-
$('#devicefirmware-group').on('change', '#id_devicefirmware-0-image', function (event) {
18-
if (!$(event.target).val()) {
19-
$('#id_devicefirmware-0-upgrade_options_jsoneditor').hide();
20-
return;
21-
}
22-
$('#id_devicefirmware-0-upgrade_options_jsoneditor').show();
23-
if (firmwareImageChanged) {
24-
django._loadJsonSchemaUi(
25-
$('#id_devicefirmware-0-upgrade_options').get(0),
26-
false,
27-
firmwareUpgraderSchema,
28-
true
29-
);
30-
} else {
31-
firmwareImageChanged = true;
32-
}
33-
});
34-
$('#devicefirmware-group .add-row a').click(function() {
35-
firmwareImageChanged = true;
36-
});
36+
}
37+
},
38+
);
39+
$("#devicefirmware-group .add-row a").click(function () {
40+
firmwareImageChanged = true;
41+
});
3742
});

‎openwisp_firmware_upgrader/static/firmware-upgrader/js/upgrade-selected-confirmation.js

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
'use strict';
1+
"use strict";
22

33
django.jQuery(function ($) {
4-
if(firmwareUpgraderSchema === null) {
5-
$('.form-row').hide();
6-
7-
} else {
8-
django._loadJsonSchemaUi(
9-
$('textarea[name="upgrade_options"]').get(0),
10-
false,
11-
firmwareUpgraderSchema,
12-
true
13-
);
14-
}
15-
$('#ow-loading').hide();
4+
if (firmwareUpgraderSchema === null) {
5+
$(".form-row").hide();
6+
} else {
7+
django._loadJsonSchemaUi(
8+
$('textarea[name="upgrade_options"]').get(0),
9+
false,
10+
firmwareUpgraderSchema,
11+
true,
12+
);
13+
}
14+
$("#ow-loading").hide();
1615
});

‎openwisp_firmware_upgrader/tests/test_selenium.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def test_restoring_deleted_device(self):
9595
reverse(f'admin:{self.config_app_label}_device_delete', args=[device.id])
9696
)
9797
self.web_driver.find_element(
98-
by=By.XPATH, value='//*[@id="content"]/form/div/input[2]'
98+
by=By.CSS_SELECTOR, value='#content form input[type="submit"]'
9999
).click()
100100
self.assertEqual(Device.objects.count(), 0)
101101
self.assertEqual(DeviceConnection.objects.count(), 0)

‎requirements-test.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
openwisp-utils[qa,selenium]~=1.1.1
1+
openwisp-utils[qa,selenium] @ https://github.com/openwisp/openwisp-utils/tarball/1.2
22
django-redis~=5.4.0
33
mock-ssh-server~=0.9.1
44
responses~=0.25.3

‎run-qa-checks

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
set -e
33
openwisp-qa-check \
44
--migration-path ./openwisp_firmware_upgrader/migrations \
5-
--migration-module firmware_upgrader
6-
7-
# JShint checks
8-
jshint openwisp_firmware_upgrader/static/firmware-upgrader/js/*.js
5+
--migration-module firmware_upgrader \
6+
--csslinter \
7+
--jslinter
98

109
echo ''
1110
echo 'Running checks for SAMPLE_APP'

‎setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
include_package_data=True,
2020
zip_safe=False,
2121
install_requires=[
22-
'openwisp-controller~=1.1.0',
22+
'openwisp-controller @ https://github.com/openwisp/openwisp-controller/tarball/1.2',
2323
'django-private-storage~=3.1.0',
2424
],
2525
classifiers=[

0 commit comments

Comments
 (0)