• 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
Closed
Merge Request !28 opened 2023-09-01 11:28:56 UTC by Enzo Yair@Ecardenez

se agrego visibilidad de serializer e included, ademas se corrigio la funcion co…

…ntador para que no cuente los guiones libres

Edited 2023-09-01 15:25:21 UTC
Request to merge feature/#36_visibilizar_includes_y_filtros 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/#36_visibilizar_includes_y_filtros origin/feature/#36_visibilizar_includes_y_filtros

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/#36_visibilizar_includes_y_filtros

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

Closed by Enzo Yair 2023-09-01 15:25:21 UTC

The changes were not merged into develop.

  • Discussion 3
  • Commits 2
  • Changes 8
  • Avatar
    Martín Miranda
    @debianitram started a discussion on an outdated diff 2023-09-01 12:55:42 UTC
    Toggle discussion
    project/apps/edicto/api.py
    filter_backends = (DjangoFilterBackend, filters.OrderingFilter)
    filterset_class = EdictoFilter
    queryset = Edicto.objects.all()
    ordering_fields = ('usuario__usuario', 'estado', 'fecha_publicacion', 'id',)
    ordering = 'id'
    ordering_fields = ('usuario__usuario',)
    • Martín Miranda
      @debianitram commented 2023-09-01 12:55:42 UTC
      Developer

      Esto está bien, usuario__usuario ?

      Edited 2023-09-01 12:55:53 UTC
    • Enzo Yair
      @Ecardenez commented 2023-09-01 13:32:12 UTC
      Master

      Si, porque usuario es un foreingkeys y esta apuntando al usuario de ese modelo o al menos asi lo entendi en la documentacion

    • Enzo Yair
      @Ecardenez commented 2023-09-01 15:25:12 UTC
      Master

      Bueno, estuve realizando las pruebas correspondiente y al parecer no es necesario. subo el archivo corregido

  • Enzo Yair
    @Ecardenez 2023-09-01 15:24:27 UTC

    Added 1 commit:

    • ad1f13a0 - correcion de filtros en la vista
  • Enzo Yair
    @Ecardenez 2023-09-01 15:25:21 UTC

    Status changed to closed

  • Please register or login to post a comment
Enzo Yair
Assignee
Enzo Yair @Ecardenez
Assign to
None
Milestone
None
Assign milestone
1
1 participant
Reference: mvmiranda/boletin_api!28