From 6a998a83c7a78fb28c42f8235423badbef6acafd Mon Sep 17 00:00:00 2001
From: efalcy <efalcy@afi-sa.fr>
Date: Thu, 24 May 2018 15:36:57 +0200
Subject: [PATCH] dev #75244 : refacto Digital ressource helper and use in
musicme
---
.../Musicme/View/Helper/Album.php | 28 ++++++-------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/library/digital_resources/Musicme/View/Helper/Album.php b/library/digital_resources/Musicme/View/Helper/Album.php
index 5e2148fcaba..a63eeb8c18d 100644
--- a/library/digital_resources/Musicme/View/Helper/Album.php
+++ b/library/digital_resources/Musicme/View/Helper/Album.php
@@ -24,30 +24,20 @@ class Musicme_View_Helper_Album extends Class_DigitalResource_AlbumViewHelper {
protected $_album;
public function album($album) {
- $this->_album = $album;
+ if(!$album)
+ return '';
- $url = $this->view->url(['module' => 'opac',
- 'controller' => 'modules',
- 'action' => 'musicme',
- 'album_id' => $album->getId()], null, true);
+ $this->_album = $album;
- if (!Class_Users::getIdentity())
- return $this->_tag('p',
- $this->view->tagAnchor($url,
- $this->_('Vous devez être connecté sous un compte avec abonnement valide pour pouvoir accéder à l\'album')));
+ $url = $this->getModuleUrl($album);
+ if ($tag = $this->tagInvalidAccount($url))
+ return $tag;
- if (!$this->canAccessRessourceNumerique())
- return $this->_tag('p',
- $this->_('Votre abonnement ne permet pas d\'accéder à la ressource. Merci de contacter la médiathèque.'));
+ if ($tag = $this->tagUserCantAccess())
+ return $tag;
+ return $this->tagAccessInNewTab($url,$album);
- return $this->view->tagAnchor($url,
- $this->_('Accéder à "%s" dans un nouvel onglet', $album->getTitre()),
- ['target' => '_blank']);
}
-
- protected function hasRightAccesRessourcesNumeriques($user) {
- return Musicme_Config::getInstance()->hasRightAccess($user);
- }
}
\ No newline at end of file
--
GitLab