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.

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

Show which pages an observer has access to #3465

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

Show which pages an observer has access to #3465

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
39 changes: 39 additions & 0 deletions integreat_cms/cms/templates/users/user_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,45 @@ <h3 class="heading font-bold text-black">
<div class="help-text">
{{ user_form.role.help_text }}
</div>
{% if access_data and user_is_observer %}
<label>
{% translate "Assigned to" %}
</label>
<table class="w-full mt-4 rounded border border-solid border-gray-200 shadow bg-white">
<thead>
<tr class="border-b border-solid border-gray-200">
<th class="text-sm text-left uppercase py-3 pl-4 pr-2">
{% translate "Region" %}
</th>
<th class="text-sm text-left uppercase py-3 pl-4 pr-2">
{% translate "Page" %}
</th>
<th class="text-sm text-left uppercase py-3 pl-4 pr-2">
{% translate "Role" %}
</th>
</tr>
</thead>
{% for entry in access_data %}
<tr class="border-b border-solid border-gray-200 hover:bg-gray-100">
<td class="text-sm text-left py-3 pl-4 pr-2">
<a href="{% url 'edit_page' region_slug=entry.page.region.slug language_slug=entry.page.region.default_language.slug page_id=entry.page.id %}">
{{ entry.page.region }}
</a>
</td>
<td class="text-sm text-left py-3 pl-4 pr-2">
<a href="{% url 'edit_page' region_slug=entry.page.region.slug language_slug=entry.page.region.default_language.slug page_id=entry.page.id %}">
{{ entry.page }}
</a>
</td>
<td class="text-sm text-left py-3 pl-4 pr-2">
<a href="{% url 'edit_page' region_slug=entry.page.region.slug language_slug=entry.page.region.default_language.slug page_id=entry.page.id %}">
{{ entry.roles }}
</a>
</td>
</tr>
{% endfor %}
</table>
{% endif %}
</div>
<div>
<label for="{{ user_form.regions.id_for_label }}" class="show-for-non-staff">
Expand Down
29 changes: 26 additions & 3 deletions integreat_cms/cms/views/users/user_form_view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@

from django.contrib import messages
from django.contrib.auth import get_user_model
from django.db.models import Q
from django.shortcuts import redirect, render
from django.utils.decorators import method_decorator
from django.utils.translation import gettext_lazy as _
from django.views.generic import TemplateView

from integreat_cms.cms.constants.roles import OBSERVER

from ...decorators import permission_required
from ...forms import UserForm
from ...models import Page
from ...utils.welcome_mail_utils import send_welcome_mail

if TYPE_CHECKING:
Expand Down Expand Up @@ -46,17 +50,36 @@ def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:

user = get_user_model().objects.filter(id=kwargs.get("user_id")).first()

pages_user_has_access_to = Page.objects.filter(
Q(authors=user) | Q(editors=user)
)

access_data = []
for page in pages_user_has_access_to:
roles = []
if user in page.authors.all():
roles.append(_("Author"))
if user in page.editors.all():
roles.append(_("Editor"))
access_data.append(
{"page": page, "roles": ", ".join(str(role) for role in roles)}
)

user_form = UserForm(instance=user)

if user and not user.is_active:
messages.info(request, _("Pending account activation"))

is_observer = OBSERVER in [group.name for group in user.groups.all()]

return render(
request,
self.template_name,
{
**self.get_context_data(**kwargs),
"user_form": user_form,
"access_data": access_data,
"user_is_observer": is_observer,
},
)

Expand All @@ -75,15 +98,15 @@ def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:

user_form = UserForm(data=request.POST, instance=user_instance)

is_observer = OBSERVER in user_instance.groups.all()

if not user_form.is_valid():
# Add error messages
user_form.add_error_messages(request)
elif not (
user_form.cleaned_data["is_superuser"]
or user_form.cleaned_data["is_staff"]
or user_form.cleaned_data["regions"]
):
# Add error message
messages.error(
request,
_(
Expand All @@ -104,7 +127,6 @@ def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
_("Only superusers can enable or disable passwordless authentication."),
)
elif not user_form.has_changed():
# Add "no changes" messages
messages.info(request, _("No changes made"))
else:
# Save forms
Expand Down Expand Up @@ -140,5 +162,6 @@ def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
{
**self.get_context_data(**kwargs),
"user_form": user_form,
"user_is_observer": is_observer,
},
)
16 changes: 12 additions & 4 deletions integreat_cms/locale/de/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ msgstr "Landkreis"
#: cms/templates/feedback/admin_feedback_list_archived.html
#: cms/templates/languages/region_list_section/region_list.html
#: cms/templates/region_condition/region_condition.html
#: cms/templates/users/user_list.html
#: cms/templates/users/user_form.html cms/templates/users/user_list.html
#: cms/views/region_condition/region_condition_actions.py
msgid "Region"
msgstr "Region"
Expand Down Expand Up @@ -1704,11 +1704,12 @@ msgstr "Archiviert"
msgid "Manager"
msgstr "Verwalter:in"

#: cms/constants/roles.py
#: cms/constants/roles.py cms/views/users/user_form_view.py
msgid "Editor"
msgstr "Redakteur:in"

#: cms/constants/roles.py cms/templates/content_versions.html
#: cms/views/users/user_form_view.py
msgid "Author"
msgstr "Autor:in"

Expand Down Expand Up @@ -2468,7 +2469,8 @@ msgstr ""

#: cms/forms/users/user_filter_form.py cms/forms/users/user_form.py
#: cms/templates/organizations/organization_form.html
#: cms/templates/users/region_user_list.html cms/templates/users/user_list.html
#: cms/templates/users/region_user_list.html cms/templates/users/user_form.html
#: cms/templates/users/user_list.html
msgid "Role"
msgstr "Rolle"

Expand Down Expand Up @@ -4975,7 +4977,8 @@ msgid ""
"Currently, contacts with an area of responsibility are not displayed in the "
"location. You can find more information in the"
msgstr ""
"Aktuell werden Kontakte mit Zuständigkeitsbereich nicht im Ort angezeigt. Mehr Informationen finden Sie im"
"Aktuell werden Kontakte mit Zuständigkeitsbereich nicht im Ort angezeigt. "
"Mehr Informationen finden Sie im"

#: cms/templates/ajax_poi_form/_poi_address_container.html
#: cms/templates/pois/poi_form_sidebar/position_box.html
Expand Down Expand Up @@ -7352,6 +7355,7 @@ msgid "File"
msgstr "Datei"

#: cms/templates/pages/_page_xliff_import_diff.html
#: cms/templates/users/user_form.html
msgid "Page"
msgstr "Seite"

Expand Down Expand Up @@ -9002,6 +9006,10 @@ msgstr ""
msgid "Designates whether this account has access to the network management."
msgstr "Legt fest, ob das Konto Zugriff auf die Netzwerkverwaltung hat."

#: cms/templates/users/user_form.html
msgid "Assigned to"
msgstr "Zugewiesen zu"

#: cms/templates/users/user_form.html
msgid "Preferred regions"
msgstr "Bevorzugte Regionen"
Expand Down
Loading