forked from mirrors/bookwyrm
Adds unblock view
This commit is contained in:
parent
7b60626661
commit
d5fbdacc02
5 changed files with 41 additions and 4 deletions
|
@ -84,12 +84,11 @@
|
||||||
<p class="help">{% trans "All users from this instance will be deactivated." %}</p>
|
<p class="help">{% trans "All users from this instance will be deactivated." %}</p>
|
||||||
</form>
|
</form>
|
||||||
{% else %}
|
{% else %}
|
||||||
{% comment %}
|
|
||||||
<form class="block" method="post" action="{% url 'settings-federated-server-unblock' server.id %}">
|
<form class="block" method="post" action="{% url 'settings-federated-server-unblock' server.id %}">
|
||||||
|
{% csrf_token %}
|
||||||
<button class="button">{% trans "Un-block" %}</button>
|
<button class="button">{% trans "Un-block" %}</button>
|
||||||
<p class="help">{% trans "All users from this instance will be re-activated." %}</p>
|
<p class="help">{% trans "All users from this instance will be re-activated." %}</p>
|
||||||
</form>
|
</form>
|
||||||
{% endcomment %}
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ class FederationViews(TestCase):
|
||||||
result.render()
|
result.render()
|
||||||
self.assertEqual(result.status_code, 200)
|
self.assertEqual(result.status_code, 200)
|
||||||
|
|
||||||
def test_server_page_post(self):
|
def test_server_page_block(self):
|
||||||
""" block a server """
|
""" block a server """
|
||||||
server = models.FederatedServer.objects.create(server_name="hi.there.com")
|
server = models.FederatedServer.objects.create(server_name="hi.there.com")
|
||||||
self.remote_user.federated_server = server
|
self.remote_user.federated_server = server
|
||||||
|
@ -76,6 +76,27 @@ class FederationViews(TestCase):
|
||||||
# and the user was deactivated
|
# and the user was deactivated
|
||||||
self.assertFalse(self.remote_user.is_active)
|
self.assertFalse(self.remote_user.is_active)
|
||||||
|
|
||||||
|
def test_server_page_unblock(self):
|
||||||
|
""" unblock a server """
|
||||||
|
server = models.FederatedServer.objects.create(
|
||||||
|
server_name="hi.there.com", status="blocked"
|
||||||
|
)
|
||||||
|
self.remote_user.federated_server = server
|
||||||
|
self.remote_user.is_active = False
|
||||||
|
self.remote_user.save()
|
||||||
|
|
||||||
|
request = self.factory.post("")
|
||||||
|
request.user = self.local_user
|
||||||
|
request.user.is_superuser = True
|
||||||
|
|
||||||
|
views.federation.unblock_server(request, server.id)
|
||||||
|
server.refresh_from_db()
|
||||||
|
self.remote_user.refresh_from_db()
|
||||||
|
self.assertEqual(server.status, "federated")
|
||||||
|
# and the user was re-activated
|
||||||
|
self.assertTrue(self.remote_user.is_active)
|
||||||
|
|
||||||
|
|
||||||
def test_add_view_get(self):
|
def test_add_view_get(self):
|
||||||
""" there are so many views, this just makes sure it LOADS """
|
""" there are so many views, this just makes sure it LOADS """
|
||||||
# create mode
|
# create mode
|
||||||
|
|
|
@ -68,6 +68,11 @@ urlpatterns = [
|
||||||
views.FederatedServer.as_view(),
|
views.FederatedServer.as_view(),
|
||||||
name="settings-federated-server",
|
name="settings-federated-server",
|
||||||
),
|
),
|
||||||
|
re_path(
|
||||||
|
r"^settings/federation/(?P<server>\d+)/unblock?$",
|
||||||
|
views.federation.unblock_server,
|
||||||
|
name="settings-federated-server-unblock",
|
||||||
|
),
|
||||||
re_path(
|
re_path(
|
||||||
r"^settings/federation/add/?$",
|
r"^settings/federation/add/?$",
|
||||||
views.AddFederatedServer.as_view(),
|
views.AddFederatedServer.as_view(),
|
||||||
|
|
|
@ -5,7 +5,7 @@ from .block import Block, unblock
|
||||||
from .books import Book, EditBook, ConfirmEditBook, Editions
|
from .books import Book, EditBook, ConfirmEditBook, Editions
|
||||||
from .books import upload_cover, add_description, switch_edition, resolve_book
|
from .books import upload_cover, add_description, switch_edition, resolve_book
|
||||||
from .directory import Directory
|
from .directory import Directory
|
||||||
from .federation import Federation, FederatedServer, AddFederatedServer
|
from .federation import Federation, FederatedServer, AddFederatedServer, unblock_server
|
||||||
from .feed import DirectMessage, Feed, Replies, Status
|
from .feed import DirectMessage, Feed, Replies, Status
|
||||||
from .follow import follow, unfollow
|
from .follow import follow, unfollow
|
||||||
from .follow import accept_follow_request, delete_follow_request
|
from .follow import accept_follow_request, delete_follow_request
|
||||||
|
|
|
@ -5,6 +5,7 @@ from django.shortcuts import get_object_or_404, redirect
|
||||||
from django.template.response import TemplateResponse
|
from django.template.response import TemplateResponse
|
||||||
from django.utils.decorators import method_decorator
|
from django.utils.decorators import method_decorator
|
||||||
from django.views import View
|
from django.views import View
|
||||||
|
from django.views.decorators.http import require_POST
|
||||||
|
|
||||||
from bookwyrm import forms, models
|
from bookwyrm import forms, models
|
||||||
from bookwyrm.settings import PAGE_LENGTH
|
from bookwyrm.settings import PAGE_LENGTH
|
||||||
|
@ -91,3 +92,14 @@ class FederatedServer(View):
|
||||||
server = get_object_or_404(models.FederatedServer, id=server)
|
server = get_object_or_404(models.FederatedServer, id=server)
|
||||||
server.block()
|
server.block()
|
||||||
return redirect("settings-federated-server", server.id)
|
return redirect("settings-federated-server", server.id)
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
@require_POST
|
||||||
|
@permission_required("bookwyrm.control_federation", raise_exception=True)
|
||||||
|
# pylint: disable=unused-argument
|
||||||
|
def unblock_server(request, server):
|
||||||
|
""" unblock a server """
|
||||||
|
server = get_object_or_404(models.FederatedServer, id=server)
|
||||||
|
server.unblock()
|
||||||
|
return redirect("settings-federated-server", server.id)
|
||||||
|
|
Loading…
Reference in a new issue