Browse Source

Altera forma para criar objeto ou estender dicionário

pull/3151/head
Vinícius Cantuária 6 years ago
parent
commit
26c684186a
  1. 2
      sapl/api/views.py
  2. 44
      sapl/base/views.py
  3. 2
      sapl/templates/crud/usuario_edit.html

2
sapl/api/views.py

@ -49,7 +49,7 @@ def create_auth_token(sender, instance=None, created=False, **kwargs):
Token.objects.create(user=instance) Token.objects.create(user=instance)
@api_view(['GET']) @api_view(['POST'])
@permission_classes([IsAdminUser]) @permission_classes([IsAdminUser])
def recria_token(request): def recria_token(request):
Token.objects.filter(user=request.user).delete() Token.objects.filter(user=request.user).delete()

44
sapl/base/views.py

@ -1769,18 +1769,16 @@ class PesquisarUsuarioView(PermissionRequiredMixin, FilterView):
return kwargs return kwargs
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(PesquisarUsuarioView, context = super(PesquisarUsuarioView, self).get_context_data(**kwargs)
self).get_context_data(**kwargs)
paginator = context['paginator'] paginator = context['paginator']
page_obj = context['page_obj'] page_obj = context['page_obj']
context['page_range'] = make_pagination( context.update({
page_obj.number, paginator.num_pages) "page_range": make_pagination(page_obj.number, paginator.num_pages),
"NO_ENTRIES_MSG": "Nenhum usuário encontrado!",
context['NO_ENTRIES_MSG'] = 'Nenhum usuário encontrado!' "title": _("Usuários")
})
context['title'] = _('Usuários')
return context return context
@ -1816,13 +1814,15 @@ class DetailUsuarioView(PermissionRequiredMixin, DetailView):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
user = get_user_model().objects.get(id=self.kwargs['pk']) user = get_user_model().objects.get(id=self.kwargs['pk'])
context["user"] = user context.update({
context["token"] = Token.objects.filter(user=user)[0] "user": user,
context["roles"] = [ "token": Token.objects.filter(user=user)[0],
"roles": [
{ {
"checked": "checked" if g in user.groups.all() else "unchecked", "checked": "checked" if g in user.groups.all() else "unchecked",
"group": g.name "group": g.name
} for g in Group.objects.all().order_by("name")] } for g in Group.objects.all().order_by("name")]
})
return context return context
@ -1842,13 +1842,13 @@ class CreateUsuarioView(PermissionRequiredMixin, CreateView):
new_user = get_user_model().objects.create( new_user = get_user_model().objects.create(
username=data['username'], username=data['username'],
email=data['email'] email=data['email'],
first_name=data['firstname'],
last_name=data['lastname'],
is_superuser=False,
is_staff=False
) )
new_user.first_name = data['firstname']
new_user.last_name = data['lastname']
new_user.set_password(data['password1']) new_user.set_password(data['password1'])
new_user.is_superuser = False
new_user.is_staff = False
new_user.save() new_user.save()
groups = Group.objects.filter(id__in=data['roles']) groups = Group.objects.filter(id__in=data['roles'])
@ -1910,11 +1910,13 @@ class EditUsuarioView(PermissionRequiredMixin, UpdateView):
user = get_user_model().objects.get(id=self.kwargs['pk']) user = get_user_model().objects.get(id=self.kwargs['pk'])
roles = [str(g.id) for g in user.groups.all()] roles = [str(g.id) for g in user.groups.all()]
initial['token'] = Token.objects.filter(user=user)[0] initial.update({
initial['first_name'] = user.first_name "token": Token.objects.filter(user=user)[0],
initial['last_name'] = user.last_name "first_name": user.first_name,
initial['roles'] = roles "last_name": user.last_name,
initial['user_active'] = user.is_active "roles": roles,
"user_active": user.is_active
})
return initial return initial

2
sapl/templates/crud/usuario_edit.html

@ -6,7 +6,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(() => { $(() => {
$("#renovar-token").click(() => { $("#renovar-token").click(() => {
$.get("{% url 'sapl.api:recria_token' %}", (res) => { $.post("{% url 'sapl.api:recria_token' %}", {}, (res) => {
$("#id_token").val(res.token); $("#id_token").val(res.token);
}); });
}); });

Loading…
Cancel
Save