diff --git a/sources/Afup/Forum/AppelConferencier.php b/sources/Afup/Forum/AppelConferencier.php index d11511551..1caf91df7 100644 --- a/sources/Afup/Forum/AppelConferencier.php +++ b/sources/Afup/Forum/AppelConferencier.php @@ -490,6 +490,10 @@ public function modifierSession( public function modifierJoindinSession($id, $joindin) { + $value = 'NULL'; + if ($joindin) { + $value = $this->_bdd->echapper($joindin); + } $requete = 'UPDATE afup_sessions SET '; $requete .= ' joindin = ' . $this->_bdd->echapper($joindin); $requete .= ' WHERE session_id = ' . (int) $id; diff --git a/tests/behat/features/Admin/Events/Planning.feature b/tests/behat/features/Admin/Events/Planning.feature index ad32c838f..ad6a6ef68 100644 --- a/tests/behat/features/Admin/Events/Planning.feature +++ b/tests/behat/features/Admin/Events/Planning.feature @@ -1,14 +1,14 @@ Feature: Administration - Évènements - Planning des sessions @reloadDbWithTestData - Scenario Outline: Accès au planning des session(s) + Scenario: Accès au planning des session(s) Given I am logged in as admin and on the Administration And I follow "Planning" Then the ".content h2" element should contain "Planning" And I should see "3 SESSION(S)" - And I should see "" - And I should see "" - And I should see "" + And I should see "Jouons tous ensemble à un petit jeu Geoffrey Bachelet" + And I should see "Geoffrey Bachelet - AFUP(@ubermuda)" + And I should see "(JOIND.IN=24041)" # modifier la programmation la session When I follow "Modifier la session Jouons tous ensemble à un petit jeu" @@ -17,6 +17,7 @@ Feature: Administration - Évènements - Planning des sessions And I select "30" from "debut[i]" And I select "11" from "fin[H]" And I select "30" from "fin[i]" + When I fill in "joindin" with "" And I press "Soumettre" Then I should see "Le planning de la session a été modifiée" And I should see "10:30 - 11:30 / La salle T" @@ -25,7 +26,3 @@ Feature: Administration - Évènements - Planning des sessions When I follow "Supprimer la session Jouons tous ensemble à un petit jeu" Then I should see "La programmation de la session a été supprimée" And I should not see "10:30 - 11:30 / La salle T" - - Examples: - | titre | speaker | id_joindin | - | Jouons tous ensemble à un petit jeu Geoffrey Bachelet | Geoffrey Bachelet - AFUP(@ubermuda) | (JOIND.IN=24041) | \ No newline at end of file