Skip to content

[fix] Guard admin reverse and template url behind FIRMWARE_UPGRADER_API #444 #447

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

Open
BHARATH0153 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix] Guard admin reverse and template url behind FIRMWARE_UPGRADER_API #444 #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions openwisp_firmware_upgrader/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
from openwisp_users.multitenancy import MultitenantAdminMixin, MultitenantOrgFilter
from openwisp_utils.admin import ReadOnlyAdmin, TimeReadonlyAdminMixin

from . import settings as app_settings
from .filters import (
BuildCategoryFilter,
BuildCategoryOrganizationFilter,
Expand Down Expand Up @@ -434,9 +435,13 @@ def get_readonly_fields(self, request, obj=None):

def change_view(self, request, object_id, extra_context=None, **kwargs):
extra_context = extra_context or {}
extra_context["upgrade_operation_cancel_url"] = reverse(
"upgrader:api_upgradeoperation_cancel",
args=["00000000-0000-0000-0000-000000000000"],
extra_context["upgrade_operation_cancel_url"] = (
reverse(
"upgrader:api_upgradeoperation_cancel",
args=["00000000-0000-0000-0000-000000000000"],
)
if app_settings.FIRMWARE_UPGRADER_API
else ""
)
extra_context["django_locale"] = get_language()
obj = self.get_object(request, object_id)
Expand Down
2 changes: 1 addition & 1 deletion openwisp_firmware_upgrader/templates/admin/firmware_upgrader/device_firmware_inline.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
var owFirmwareUpgraderApiHost = {
host: "{{ request.get_host|escapejs }}"
};
var owUpgradeOperationCancelUrl = "{% url 'upgrader:api_upgradeoperation_cancel' '00000000-0000-0000-0000-000000000000' %}";
var owUpgradeOperationCancelUrl = "{% url 'upgrader:api_upgradeoperation_cancel' '00000000-0000-0000-0000-000000000000' as cancel_url %}{{ cancel_url|default:'' }}";
</script>
Loading