diff --git a/VERSIONS_HOTLINE/141490 b/VERSIONS_HOTLINE/141490 new file mode 100644 index 0000000000000000000000000000000000000000..726395daa850de457aeac9e34961c2e9479535da --- /dev/null +++ b/VERSIONS_HOTLINE/141490 @@ -0,0 +1 @@ + - ticket #141490 : Activités : Correction, on ne pouvait pas s'inscrire au même jour que la date de début d'inscription \ No newline at end of file diff --git a/library/Class/SessionActivity.php b/library/Class/SessionActivity.php index da6b24742487414fe81c7fee6c0a087a2e195340..d2feca5ea317dcf4729b05649435dbe4ebd5350f 100644 --- a/library/Class/SessionActivity.php +++ b/library/Class/SessionActivity.php @@ -243,7 +243,7 @@ class Class_SessionActivity extends Storm_Model_Abstract { return false; return !$this->hasDateLimiteDebut() - || strtotime($this->getDateLimiteDebut()) < strtotime(self::getTimeSource()->dateYmd()); + || strtotime($this->getDateLimiteDebut()) <= strtotime(self::getTimeSource()->dateYmd()); } diff --git a/tests/scenarios/Activities/AbonneControllerWithQuotasTest.php b/tests/scenarios/Activities/AbonneControllerWithQuotasTest.php index 919815b2603bdf45d8383b090739bc48ac83efce..017f3e75d21fcb7993758868d625eb6e486ba86c 100644 --- a/tests/scenarios/Activities/AbonneControllerWithQuotasTest.php +++ b/tests/scenarios/Activities/AbonneControllerWithQuotasTest.php @@ -857,3 +857,27 @@ class Activities_AbonneControllerWithQuotasNotFullWithQueuePostTest $this->assertFalse($this->_inscription->isQueue()); } } + + + + +/* hotline: #141490 */ +class AbonneControllerWithQuotasWithDateDebutInscriptionTest + extends AbonneControllerWithQuotasTestCase { + + public function setUp() { + parent::setUp(); + $this->_session_smalltalk_janvier + ->setDateLimiteDebut('2014-05-01') + ->assertSave(); + + $this->dispatch('/activities'); + } + + + /** @test */ + public function userCanSubscribe() { + $this->assertXPathContentContains('//table[@class="sessions"]//td', + "S'inscrire"); + } +}