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.

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

Version 2.0.1 #36

Merged
merged 5 commits into from
Oct 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,11 @@ Restart NetBox service:
systemctl restart netbox
```
<!--install-end-->

<!--usage-start-->
## Usage

Read the [docs](https://miaow2.github.io/netbox-config-diff/usage) about how to use plugin.
Read this [doc](docs/colliecting-diffs.md) about collecting diffs, for configuration management read [this](docs/configuratiom-management.md)
<!--usage-end-->

## Screenshots

Expand Down
2 changes: 1 addition & 1 deletion docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 2.0.0 (2023-10-XX)
## 2.0.0 (2023-10-18)

* [#25](https://github.com/miaow2/netbox-config-diff/issues/25) Add configuration management

Expand Down
8 changes: 5 additions & 3 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
end="<!--install-end-->"
%}

## Usage

Read this [doc](colliecting-diffs.md) about collecting diffs, for configuration management read [this](configuratiom-management.md)
{%
include-markdown "../README.md"
start="<!--usage-start-->"
end="<!--usage-end-->"
%}
2 changes: 1 addition & 1 deletion netbox_config_diff/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

__author__ = "Artem Kotik"
__email__ = "[email protected]"
__version__ = "2.0.0"
__version__ = "2.0.1"


class ConfigDiffConfig(PluginConfig):
Expand Down
6 changes: 2 additions & 4 deletions netbox_config_diff/views/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from core.tables import JobTable
from django.contrib import messages
from django.contrib.auth.models import User
from django.contrib.contenttypes.models import ContentType
from django.db.models import Q
from django.http import HttpResponseForbidden
from django.shortcuts import get_object_or_404, redirect, render
from netbox.constants import RQ_QUEUE_DEFAULT
Expand Down Expand Up @@ -300,9 +300,7 @@ def post(self, request, pk):


class JobListView(generic.ObjectListView):
queryset = Job.objects.filter(
object_type=ContentType.objects.get(app_label="netbox_config_diff", model="configurationrequest")
)
queryset = Job.objects.filter(Q(name__contains="push_configs") | Q(name__contains="collect_diffs"))
filterset = JobFilterSet
filterset_form = JobFilterForm
table = JobTable
Expand Down