Skip to content
Snippets Groups Projects
Commit e34df372 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

dev #30936 remove empty@email

parent 50660f2a
Branches
Tags
3 merge requests!1267Master,!1247Dev#30936 dev30936 cdscript import,!1206Dev#30936 dev30936 cdscript import
...@@ -78,7 +78,7 @@ class Class_Webservice_SIGB_CdScript_Service { ...@@ -78,7 +78,7 @@ class Class_Webservice_SIGB_CdScript_Service {
$user->getNom(), $user->getNom(),
$user->getPrenom(), $user->getPrenom(),
$user->getNaissance(), $user->getNaissance(),
'empty@email', '',
$user->getDateFin()]); $user->getDateFin()]);
} }
...@@ -86,14 +86,13 @@ class Class_Webservice_SIGB_CdScript_Service { ...@@ -86,14 +86,13 @@ class Class_Webservice_SIGB_CdScript_Service {
public function getNotice($id) { public function getNotice($id) {
$sigb_record = new Class_WebService_SIGB_Notice($id); $sigb_record = new Class_WebService_SIGB_Notice($id);
$sigb_item = new Class_WebService_SIGB_Exemplaire($id); $sigb_item = new Class_WebService_SIGB_Exemplaire($id);
$sigb_record->addExemplaire($sigb_item);
if($item = $this->_getItem($id)) { if($item = $this->_getItem($id)) {
$sigb_item->setCodeBarre($id); $sigb_item->setCodeBarre($id);
$sigb_item->setBibliotheque($item->getBib()); $sigb_item->setBibliotheque($item->getBib());
$item->setUrl($this->getRessourceUrl($item))->save(); $item->setUrl($this->getRessourceUrl($item))->save();
} }
$sigb_record->addExemplaire($sigb_item);
return $sigb_record; return $sigb_record;
} }
......
...@@ -84,7 +84,7 @@ class NoticeAjaxControllerCdScriptRecordTest extends AbstractControllerTestCase ...@@ -84,7 +84,7 @@ class NoticeAjaxControllerCdScriptRecordTest extends AbstractControllerTestCase
/** @test */ /** @test */
public function linkToJumelShouldBePresent() { public function linkToJumelShouldBePresent() {
$this->assertXPathContentContains('//table//a[contains(@href, "www.jumel39.fr/docnum.php?bib=2&res=kio&lien=456789&time=1446019200&user=654987:Le Pollux:Paul:2002-12-14:empty@email:2015-12-14")]', 'Description en ligne', $this->_response->getBody()); $this->assertXPathContentContains('//table//a[contains(@href, "www.jumel39.fr/docnum.php?bib=2&res=kio&lien=456789&time=1446019200&user=654987:Le Pollux:Paul:2002-12-14::2015-12-14")]', 'Description en ligne', $this->_response->getBody());
} }
...@@ -96,7 +96,7 @@ class NoticeAjaxControllerCdScriptRecordTest extends AbstractControllerTestCase ...@@ -96,7 +96,7 @@ class NoticeAjaxControllerCdScriptRecordTest extends AbstractControllerTestCase
/** @test */ /** @test */
public function scriptTargetBlankShouldBePresent() { public function scriptTargetBlankShouldBePresent() {
$this->assertXpathContentContains('//script', 'setupAnchorsTarget'); $this->assertXPathContentContains('//script', 'setupAnchorsTarget');
} }
} }
?> ?>
\ No newline at end of file
...@@ -90,7 +90,7 @@ class CdScriptServiceTest extends CdScriptTestCase { ...@@ -90,7 +90,7 @@ class CdScriptServiceTest extends CdScriptTestCase {
/** @test */ /** @test */
public function ressourceUrlShouldBeJumelBib2UserPaulAnd12oclok() { public function ressourceUrlShouldBeJumelBib2UserPaulAnd12oclok() {
$this->assertEquals('www.jumel39.fr/docnum.php?bib=2&res=kio&lien=456789&time=1446019200&user=654987:Le Pollux:Paul:2002-12-14:empty@email:2015-12-14', $this->_service->getRessourceUrl($this->_le_kiosque)); $this->assertEquals('www.jumel39.fr/docnum.php?bib=2&res=kio&lien=456789&time=1446019200&user=654987:Le Pollux:Paul:2002-12-14::2015-12-14', $this->_service->getRessourceUrl($this->_le_kiosque));
} }
...@@ -102,7 +102,7 @@ class CdScriptServiceTest extends CdScriptTestCase { ...@@ -102,7 +102,7 @@ class CdScriptServiceTest extends CdScriptTestCase {
/** @test */ /** @test */
public function leKiosqueItemUrlShouldBeJumelLink() { public function leKiosqueItemUrlShouldBeJumelLink() {
$this->assertEquals('www.jumel39.fr/docnum.php?bib=2&res=kio&lien=456789&time=1446019200&user=654987:Le Pollux:Paul:2002-12-14:empty@email:2015-12-14', $this->_le_kiosque->getUrl()); $this->assertEquals('www.jumel39.fr/docnum.php?bib=2&res=kio&lien=456789&time=1446019200&user=654987:Le Pollux:Paul:2002-12-14::2015-12-14', $this->_le_kiosque->getUrl());
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment