• This project
    • Loading...
  • Sign in

Marta Miranda / boletin_api

Logo codes
Go to a project
Toggle navigation
  • Projects
  • Groups
  • Snippets
  • Help
Toggle navigation pinning
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Issues 0
  • Merge Requests 0
  • Wiki
  • Network
  • Create a new issue
  • Builds
  • Commits
Merged
Merge Request !5 opened 2023-06-15 11:57:49 UTC by Marta Miranda@mvmiranda

Feature/#9 crear nuevas app usuarios

Edited 2023-06-21 16:22:54 UTC
Request to merge feature/#9_crear_nuevas_app_usuarios into develop
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b feature/#9_crear_nuevas_app_usuarios origin/feature/#9_crear_nuevas_app_usuarios

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout develop
git merge --no-ff feature/#9_crear_nuevas_app_usuarios

Step 4. Push the result of the merge to GitLab

git push origin develop

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

Merged by Martín Miranda 2023-06-21 16:22:54 UTC

The changes were merged into develop. The source branch has been removed.

  • Discussion 5
  • Commits 4
  • Changes 36
  • Marta Miranda
    @mvmiranda 2023-06-15 14:38:55 UTC

    Added 3 commits:

    • bb3b1e05...7b51bfd3 - 2 commits from branch develop
    • b7018167 - Solucionar conflictos base.txt
  • Avatar
    Martín Miranda
    @debianitram started a discussion on the diff 2023-06-15 14:44:19 UTC
    Toggle discussion
    project/apps/core/permissions.py 0 → 100644
    from rest_framework.permissions import DjangoModelPermissions
    class CustomModelPermissions(DjangoModelPermissions):
    • Martín Miranda
      @debianitram commented 2023-06-15 14:44:19 UTC
      Developer

      Por qué haces una implementación Custom de DjangoModelPermissions? En caso de necesitarlo utiliza la definida por el framework, voy a dejarte un enlace para que veas que tu definición es la misma que está en el framework . https://github.com/encode/django-rest-framework/blob/master/rest_framework/permissions.py

      Edited 2023-06-15 14:51:22 UTC
    • Marta Miranda
      @mvmiranda commented 2023-06-16 14:07:08 UTC
      Master

      Martin se lo hizo porque class DjangoModelPermissions(BasePermission), no estaba especificado el metodo get

      # Map methods into required permission codes.
      # Override this if you need to also provide 'view' permissions,
      # or if you want to provide custom permission codes.
      perms_map = {
          'GET': [],
          'OPTIONS': [],
          'HEAD': [],
          'POST': ['%(app_label)s.add_%(model_name)s'],
          'PUT': ['%(app_label)s.change_%(model_name)s'],
          'PATCH': ['%(app_label)s.change_%(model_name)s'],
          'DELETE': ['%(app_label)s.delete_%(model_name)s'],
      }
  • Avatar
    Martín Miranda
    @debianitram started a discussion on the diff 2023-06-15 14:44:59 UTC
    Toggle discussion
    project/apps/organismo/api.py 0 → 100644
    from rest_framework import viewsets, filters
    from django_filters.rest_framework import DjangoFilterBackend
    from rest_framework.permissions import IsAuthenticated
    from core.permissions import CustomModelPermissions
    • Martín Miranda
      @debianitram commented 2023-06-15 14:44:59 UTC
      Developer

      Por favor elimina la importación de CustomModelPermissions esto si no lo estamos utilizando.

      Edited 2023-06-15 14:50:23 UTC
  • Avatar
    Martín Miranda
    @debianitram started a discussion on an outdated diff 2023-06-15 14:45:13 UTC
    Toggle discussion
    project/apps/organismo/api.py 0 → 100644
    from rest_framework import viewsets, filters
    from django_filters.rest_framework import DjangoFilterBackend
    from rest_framework.permissions import IsAuthenticated
    from core.permissions import CustomModelPermissions
    from organismo.filters import OrganismoFilter
    from organismo.models import Organismo
    from organismo.serializers import OrganismoSerializer
    class OrganismoViewSet(viewsets.ReadOnlyModelViewSet):
    queryset = Organismo.objects.all()
    # permission_classes = (IsAuthenticated, CustomModelPermissions)
    • Martín Miranda
      @debianitram commented 2023-06-15 14:45:13 UTC
      Developer

      Por favor elimina la propiedad permission_classes esto si no se está utilizando.

      Edited 2023-06-15 14:49:46 UTC
  • Avatar
    Martín Miranda
    @debianitram started a discussion on an outdated diff 2023-06-15 14:46:45 UTC
    Toggle discussion
    project/apps/organismo/tests.py 0 → 100644
    from django.test import TestCase
    • Martín Miranda
      @debianitram commented 2023-06-15 14:46:45 UTC
      Developer

      Por favor elimina este archivo que no se utiliza, los tests los estás definiendo en el directorio tests de la aplicación organismo.

  • Marta Miranda
    @mvmiranda 2023-06-16 14:08:45 UTC

    Added 1 commit:

    • 55952da0 - Modificado las modificaciones solicitadas
  • Martín Miranda
    @debianitram 2023-06-21 16:22:54 UTC

    Status changed to merged

  • Martín Miranda
    @debianitram 2023-06-21 16:22:54 UTC

    mentioned in commit 1d0f41cb

  • Please register or login to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
2
2 participants
Reference: mvmiranda/boletin_api!5
×

Revert this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.