From 61f647511e756c579a191d3fccda2f48fd0a4bde Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Mon, 28 May 2018 10:56:12 +0200
Subject: [PATCH] dev #75244 revert unwanted refacto

---
 .../Class/DigitalResource/AlbumViewHelper.php | 44 +++----------------
 .../LesYeuxDoc/View/Helper/Album.php          | 24 +---------
 .../Musicme/View/Helper/Album.php             | 30 ++++++++-----
 3 files changed, 26 insertions(+), 72 deletions(-)

diff --git a/library/Class/DigitalResource/AlbumViewHelper.php b/library/Class/DigitalResource/AlbumViewHelper.php
index 3004142ec02..f1e5e7faa19 100644
--- a/library/Class/DigitalResource/AlbumViewHelper.php
+++ b/library/Class/DigitalResource/AlbumViewHelper.php
@@ -29,53 +29,19 @@ class Class_DigitalResource_AlbumViewHelper extends ZendAfi_View_Helper_BaseHelp
   }
 
 
-  protected function getModuleUrl($album) {
-    return $this->view->url(['module' => 'opac',
+  public function album($album) {
+    if(!$album)
+      return '';
+
+    $url = $this->view->url(['module' => 'opac',
                              'controller' => 'modules',
                              'action' => $this->_config->getSsoAction(),
                              'album_id' => $album->getId()],
                             null,
                             true);
-  }
 
-  protected function tagAccessInNewTab($url,$album) {
     return $this->view->tagAnchor($url,
                                   $this->_('Accéder à "%s" dans un nouvel onglet', $album->getTitre()),
                                   ['target' => '_blank']);
-
-
-  }
-
-
-
-  protected function tagInvalidAccount($url) {
-    if (Class_Users::getIdentity())
-      return false;
-    return $this->_tag('p',
-                       $this->view->tagAnchor($url,
-                                              $this->_('Vous devez être connecté sous un compte avec abonnement valide pour pouvoir accéder à la ressource')));
-
-  }
-
-  protected function tagUserCantAccess () {
-    if ($this->hasRightAccesRessourcesNumeriques(Class_Users::getIdentity()))
-      return false;
-    return $this->_tag('p',
-                       $this->_('Votre abonnement ne permet pas d\'accéder à la ressource. Merci de contacter la médiathèque.'));
-
-
-  }
-
-  protected function hasRightAccesRessourcesNumeriques($user) {
-    return $this->_config->hasRightAccess($user);
-  }
-
-
-
-  public function album($album) {
-    if(!$album)
-      return '';
-    $url = $this->getModuleUrl($album) ;
-    return $this->tagAccessInNewTab($url,$album);
   }
 }
\ No newline at end of file
diff --git a/library/digital_resources/LesYeuxDoc/View/Helper/Album.php b/library/digital_resources/LesYeuxDoc/View/Helper/Album.php
index 28632bdb000..14d4e49d34b 100644
--- a/library/digital_resources/LesYeuxDoc/View/Helper/Album.php
+++ b/library/digital_resources/LesYeuxDoc/View/Helper/Album.php
@@ -20,26 +20,4 @@
  */
 
 
-class LesYeuxDoc_View_Helper_Album extends Class_DigitalResource_AlbumViewHelper {
-
-  public function album($album) {
-    if(!$album)
-      return '';
-    $url = $this->getModuleUrl($album);
-    if ($tag = $this->tagInvalidAccount($url))
-      return $tag;
-
-    if ($tag = $this->tagUserCantAccess())
-      return $tag;
-
-    return $this->tagAccessInNewTab($url,$album);
-
-  }
-
-
-  protected function hasRightAccesRessourcesNumeriques($user) {
-    return LesYeuxDoc_Config::getInstance()->hasRightAccess($user);
-  }
-
-
-}
\ No newline at end of file
+class LesYeuxDoc_View_Helper_Album extends Class_DigitalResource_AlbumViewHelper {}
\ No newline at end of file
diff --git a/library/digital_resources/Musicme/View/Helper/Album.php b/library/digital_resources/Musicme/View/Helper/Album.php
index a63eeb8c18d..fbe6ccbdb94 100644
--- a/library/digital_resources/Musicme/View/Helper/Album.php
+++ b/library/digital_resources/Musicme/View/Helper/Album.php
@@ -19,25 +19,35 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-class Musicme_View_Helper_Album extends Class_DigitalResource_AlbumViewHelper {
+class Musicme_View_Helper_Album extends ZendAfi_View_Helper_TagRessourceNumerique {
 
   protected $_album;
 
   public function album($album) {
-    if(!$album)
-      return '';
-
     $this->_album = $album;
 
-    $url = $this->getModuleUrl($album);
-    if ($tag = $this->tagInvalidAccount($url))
-      return $tag;
+    $url = $this->view->url(['module' => 'opac',
+                             'controller' => 'modules',
+                             'action' => 'musicme',
+                             'album_id' => $album->getId()], null, true);
+
+    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')));
 
-    if ($tag = $this->tagUserCantAccess())
-      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.'));
 
-    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