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.

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

Exclusion des événements en brouillon des liens libres #629

Merged
merged 1 commit into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions sv/form_mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from core.fields import MultiModelChoiceField
from core.models import LienLibre
from sv.models import Evenement


class WithDataRequiredConversionMixin:
Expand Down Expand Up @@ -35,6 +36,7 @@ def _add_free_links(self, model):
.get_user_can_view(self.user)
.select_related("numero")
.exclude(id=self.instance.id)
.exclude(etat=Evenement.Etat.BROUILLON)
)
self.fields["free_link"] = MultiModelChoiceField(
required=False,
Expand Down
42 changes: 41 additions & 1 deletion sv/tests/test_evenement_update.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from playwright.sync_api import Page, expect

from core.models import LienLibre, Structure
from core.models import LienLibre, Structure, Visibilite
from ..factories import EvenementFactory, OrganismeNuisibleFactory
from ..factories import StatutReglementaireFactory
from ..models import StatutReglementaire, Evenement
Expand Down Expand Up @@ -138,3 +138,43 @@ def test_update_evenement_multiple_times_adds_contacts_once(
str(mocked_authentification_user.agent.structure), exact=True
)
).to_be_visible()


def test_update_evenement_cant_select_draft_evenement_in_free_links(
live_server,
page: Page,
choice_js_cant_pick,
):
evenement = EvenementFactory()
draft_evenement = EvenementFactory(etat=Evenement.Etat.BROUILLON)

page.goto(f"{live_server.url}{evenement.get_update_url()}")

fiche_input = "Événement : " + str(draft_evenement.numero)
choice_js_cant_pick(page, "#liens-libre .choices", str(draft_evenement.numero), fiche_input)


def test_update_evenement_free_links_filtered_by_user_visibility(
live_server,
page: Page,
mocked_authentification_user,
):
# Événement visible en national
visible_evenement = EvenementFactory(visibilite=Visibilite.NATIONALE)

# Événement en visibilité limitée avec structure autorisée
limited_visible_evenement = EvenementFactory()
limited_visible_evenement.visibilite = Visibilite.LIMITEE
limited_visible_evenement.allowed_structures.add(mocked_authentification_user.agent.structure)
limited_visible_evenement.save()

# Événement en visibilité limitée sans accès
hidden_evenement = EvenementFactory(createur=Structure.objects.create(niveau1="test"))

evenement = EvenementFactory()
page.goto(f"{live_server.url}{evenement.get_update_url()}")
page.locator("#liens-libre .choices").click()

expect(page.get_by_text(str(visible_evenement.numero))).to_be_visible()
expect(page.get_by_text(str(limited_visible_evenement.numero))).to_be_visible()
expect(page.get_by_text(str(hidden_evenement.numero))).not_to_be_visible()
Loading