diff --git a/VERSIONS_HOTLINE/71669 b/VERSIONS_HOTLINE/71669
new file mode 100644
index 0000000000000000000000000000000000000000..fbaa9bb377e08ff459c0049690758cdf3e6809c0
--- /dev/null
+++ b/VERSIONS_HOTLINE/71669
@@ -0,0 +1,2 @@
+ - ticket #71669 : Administration : ajout d'un tableau de bord pour les ressources numériques.
+
\ No newline at end of file
diff --git a/application/modules/admin/controllers/BatchController.php b/application/modules/admin/controllers/BatchController.php
index fc774d80779c828e4f82c96667e3fa075a578e3d..0e23b19b2dc95a2f94d89cefbf07aee1ebd02b1a 100644
--- a/application/modules/admin/controllers/BatchController.php
+++ b/application/modules/admin/controllers/BatchController.php
@@ -42,7 +42,7 @@ class Admin_BatchController extends ZendAfi_Controller_Action {
->save();
$this->_helper->notify('Tâche activée');
- $this->_redirectToIndex();
+ $this->_redirectToReferer();
}
@@ -55,7 +55,7 @@ class Admin_BatchController extends ZendAfi_Controller_Action {
$batch->delete();
$this->_helper->notify('Tâche désactivée');
- $this->_redirectToIndex();
+ $this->_redirectToReferer();
}
diff --git a/application/modules/admin/views/scripts/bibnum/index.phtml b/application/modules/admin/views/scripts/bibnum/index.phtml
index f03933bd1723b72c870fa1464e99e411963f60d0..8a0e176813af210aea5a810ea393a2d7ad9c840f 100644
--- a/application/modules/admin/views/scripts/bibnum/index.phtml
+++ b/application/modules/admin/views/scripts/bibnum/index.phtml
@@ -1,9 +1,9 @@
<p><?php
-echo $this->_("Bokeh s'interface avec un certain nombre de ressources numériques. Les ressources numérisées sont cataloguées dans le portail et indexées dans l’OPAC comme les notices du SIGB. Ce qui constitue la force et le caractère unique de Bokeh, est sa capacité à proposer une recherche fusionnée par un métamoteur qui interroge simultanément tous les fonds et tous les contenus.");
-?></p>
+ echo $this->_("Bokeh s'interface avec un certain nombre de ressources numériques. Les ressources numérisées sont cataloguées dans le portail et indexées dans l’OPAC comme les notices du SIGB. Ce qui constitue la force et le caractère unique de Bokeh, est sa capacité à proposer une recherche fusionnée par un métamoteur qui interroge simultanément tous les fonds et tous les contenus.");
+ ?></p>
<p><?php
-echo $this->_("Si vous souhaitez ajouter une ressource à votre portail, il vous faut contractualiser avec le fournisseur de la ressource et demander un devis pour le connecteur à <a href='mailto:cial-bib@afi-sa.fr'>votre commercial</a>.");
-?></p>
+ echo $this->_("Si vous souhaitez ajouter une ressource à votre portail, il vous faut contractualiser avec le fournisseur de la ressource et demander un devis pour le connecteur à <a href='mailto:cial-bib@afi-sa.fr'>votre commercial</a>.");
+ ?></p>
<?php
$datas = (new Class_WebService_BibNumerique_Connectors())->getDescription();
$datas = json_decode(json_encode($datas));
@@ -13,15 +13,15 @@ $datas = json_decode(json_encode($datas));
<?php
foreach($datas as $code => $connector) {
$thumb = $connector->image_url
- ? $this->tag('img', null, ['src' => $connector->image_url,
- 'alt' => $connector->label,
- 'style' => 'width:200px;'])
- : $connector->label;
+ ? $this->tag('img', null, ['src' => $connector->image_url,
+ 'alt' => $connector->label,
+ 'style' => 'width:200px;'])
+ : $connector->label;
$thumb = $connector->url
- ? $this->tag('a', $thumb, ['href' => $connector->url,
- 'target' => '_blank'])
- : $thumb;
+ ? $this->tag('a', $thumb, ['href' => $connector->url,
+ 'target' => '_blank'])
+ : $thumb;
$key_exists = function($key) use ($connector) {
return in_array($key, $connector->features);
@@ -44,22 +44,37 @@ $datas = json_decode(json_encode($datas));
['href' => $connector->sales_contact->url,
'target' => '_blank']);
?>
- <tr data-code="<?php echo strtolower($connector->code) ?>" >
- <td><?php echo $thumb; ?></td>
- <td><?php echo $connector->desc; ?>
- <?php if ($features) { ?>
- <br/><br/>
- <?php echo $this->tag('strong', $this->_('Fonctionnalités : ')) . implode(', ', $features);?>
- <?php } ?>
- <?php if ($contact) { ?>
- <br/><br/>
- <?php echo $this->tag('strong', $this->_('Contact : ')) . implode(', ', $contact);}?>
- <br/><br/>
- <?php if ($connector->enabled) {
- echo $this->tag('div', $this->_('Activé'), ['class' => 'enabled']);?>
- <?php } ?>
- </td>
- </tr>
- <?php } ?>
+ <tr data-code="<?php echo strtolower($connector->code) ?>" >
+ <td><?php echo $thumb; ?></td>
+ <td><?php echo $connector->desc; ?>
+ <?php if ($features) { ?>
+ <br/><br/>
+ <?php echo $this->tag('strong', $this->_('Fonctionnalités : ')) . implode(', ', $features);?>
+ <?php } ?>
+ <?php if ($contact) { ?>
+ <br/><br/>
+ <?php echo $this->tag('strong', $this->_('Contact : ')) . implode(', ', $contact);}?>
+ <br/><br/>
+ <?php
+ $label = $this->_('Désactivé');
+ $class = 'digital_connectors_status';
+ if ($connector->enabled) {
+ $label = $this->_('Activé');
+ $class .= ' enabled';
+ }
+ echo $this->button((new Class_Entity)
+ ->setText($label)
+ ->setAttribs(['disabled' => 'disabled',
+ 'onclick' => 'return;',
+ 'class' => $class]));
+
+ if(isset($connector->dashboard_url))
+ echo $this->button((new Class_Entity)
+ ->setUrl($connector->dashboard_url)
+ ->setText($this->_('Tableau de bord')));
+ ?>
+ </td>
+ </tr>
+ <?php } ?>
</tbody>
</table>
diff --git a/application/modules/admin/views/scripts/digital_resources/index.phtml b/application/modules/admin/views/scripts/digital_resources/index.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..dfead8124e7088a422ae130899d21d4aeef9d2bf
--- /dev/null
+++ b/application/modules/admin/views/scripts/digital_resources/index.phtml
@@ -0,0 +1,2 @@
+<?php
+echo $this->DigitalResource_Dashboard($this->config);
diff --git a/application/modules/opac/controllers/AuthController.php b/application/modules/opac/controllers/AuthController.php
index b242dbefd307a0dd6adf0932430a651f8993f959..41f94f13c9b18fdb57d3a3f0816cded2e612c623 100644
--- a/application/modules/opac/controllers/AuthController.php
+++ b/application/modules/opac/controllers/AuthController.php
@@ -798,10 +798,8 @@ class Auth_Strategy_Cas_Abstract extends Auth_Strategy_Abstract{
public function redirectMusicme() {
- if (strpos($this->controller->getCasServerUrl(),'musicme') !== false) {
- $module_menu = Class_DigitalResource::getInstance()->getModuleMenuFor('Musicme');
- return $module_menu->getDynamiqueUrl();
- }
+ if (strpos($this->controller->getCasServerUrl(),'musicme') !== false)
+ return Musicme_Config::getInstance()->getSsoUrl(Class_Users::getIdentity());
return false;
}
diff --git a/application/modules/opac/controllers/ModulesController.php b/application/modules/opac/controllers/ModulesController.php
index 3dfa1208fc7bcab52357ff10ed11e2678d19300a..49672950649e593c62e8bab7cfe760be005adb3d 100644
--- a/application/modules/opac/controllers/ModulesController.php
+++ b/application/modules/opac/controllers/ModulesController.php
@@ -76,20 +76,21 @@ class ModulesController extends ZendAfi_Controller_Action {
public function ssoAction() {
if (!$record = Class_Notice::find($this->_getParam('id', 0))) {
- $this->_helper->notify($this->_('Document non trouvé'));
+ $this->_helper->notify($this->_('L\'identifiant du document demandé n\'existe pas'));
$this->_redirectToReferer();
return;
}
$sso_record = new Class_Notice_Sso($record);
- if(!$module_menu = $sso_record->getModuleMenu()) {
- $this->_helper->notify($this->_('Oups, l\'adresse de consultation de ce document est indeterminée'));
- $this->_redirectToReferer();
- return;
+ if(!$digital_resource_config = $sso_record->getConfig()) {
+ $this->_helper->notify($this->_('Ce document ne possède pas de configuration permettant d\'utiliser cette URL.'));
+ return $this->_redirectToReferer();
}
- $module_menu->setRecord($sso_record);
- $this->simple($module_menu);
+ $this->_forward('sso',
+ 'index',
+ $digital_resource_config->getModuleName(),
+ $this->_request->getParams());
}
diff --git a/library/Class/DigitalResource.php b/library/Class/DigitalResource.php
index 9c28f2f703ead284992066c2b07b1b36c9458c49..6641cc19f68a8282d4de16e2b5e96f4bb91b7f68 100644
--- a/library/Class/DigitalResource.php
+++ b/library/Class/DigitalResource.php
@@ -303,6 +303,11 @@ class Class_DigitalResource extends Class_Entity {
}
+ public function getAdminVarInstance($plugin, $name) {
+ return Class_AdminVar::find($this->withNamespace($plugin, $name));
+ }
+
+
public function getDocType($plugin) {
return $plugin;
}
diff --git a/library/Class/DigitalResource/Batch.php b/library/Class/DigitalResource/Batch.php
index 341777fb34e20789a335a3cddd2089cd3ca41a3b..0293ea57131135fffc4e45f4f81ac86b01500c00 100644
--- a/library/Class/DigitalResource/Batch.php
+++ b/library/Class/DigitalResource/Batch.php
@@ -20,7 +20,7 @@
*/
-class Class_DigitalResource_Batch extends Class_Batch_RessourceNumerique{
+class Class_DigitalResource_Batch extends Class_Batch_RessourceNumerique {
protected $_config;
public function __construct($config) {
diff --git a/library/Class/DigitalResource/Config.php b/library/Class/DigitalResource/Config.php
index 992baea113a39341960f0792dcf9fc5c6d060d39..085771f4cf6c99d79c15bcac1d4e51ed9402f8b1 100644
--- a/library/Class/DigitalResource/Config.php
+++ b/library/Class/DigitalResource/Config.php
@@ -53,21 +53,47 @@ class Class_DigitalResource_Config extends Class_Entity {
public function registerFrontController($front_controller) {
$front_controller->addControllerDirectory((new Class_DigitalResource_Name())->getPath($this) . '/controllers',
- $this->getDigitalResource()->getModuleNameFor(static::getName()));
+ $this->getModuleName());
return $this;
}
+ public function getModuleName() {
+ return $this->getDigitalResource()->getModuleNameFor(static::getName());
+ }
+
+
public function isEnabled() {
return $this->getDigitalResource()->isAdminVarOn(static::getName());
}
+ public function getDashboardUrl() {
+ return Class_Url::absolute(['module' => $this->getModuleName()],
+ null,
+ true);
+ }
+
+
+ public function getBatchInstance() {
+ return $this->getDigitalResource()->getBatches()[$this->getBatch()];
+ }
+
+
public function getAdminVar($id) {
return $this->getDigitalResource()->getAdminVar($id);
}
+ public function getAdminVarsInstances() {
+ $vars = [];
+ foreach($this->getAdminVars() as $key => $meta)
+ $vars [] = $this->getDigitalResource()->getAdminVarInstance($key);
+
+ return $vars;
+ }
+
+
public function hasRightAccess($user) {
return $this->getDigitalResource()->hasRightAccessPlugin($user);
}
@@ -103,7 +129,8 @@ class Class_DigitalResource_Config extends Class_Entity {
'features' => $this->getFeatures(),
'sales_contact' => ['mail' => $this->getMail(),
'url' => $this->getMailUrl()],
- 'enabled' => $this->isEnabled()];
+ 'enabled' => $this->isEnabled(),
+ 'dashboard_url' => $this->getDashboardUrl()];
}
@@ -162,4 +189,42 @@ class Class_DigitalResource_Config extends Class_Entity {
public function withNameSpace($value) {
return $this->getDigitalResource()->withNameSpace($value);
}
+
+
+ public function urlFor($user, $album = null, $record = null) {
+ if(!$user)
+ return;
+
+ if (!$this->hasRightAccess($user))
+ return;
+
+ if(!$this->isEnabled())
+ return;
+
+ if($record)
+ return $this->getRecordSsoUrl($user, $record);
+
+ if($album)
+ return $this->getAlbumSsoUrl($user, $album);
+
+ return $this->getSsoUrl($user);
+ }
+
+
+ public function getSsoUrl($user) {
+ return '';
+ }
+
+
+ public function getAlbumSsoUrl($user, $album) {
+ if(!$album)
+ return '';
+
+ return $album->getExternalUri();
+ }
+
+
+ public function getRecordSsoUrl($user, $record) {
+ return $this->getAlbumSsoUrl($suer, $record->getAlbum());
+ }
}
\ No newline at end of file
diff --git a/library/Class/DigitalResource/Controller.php b/library/Class/DigitalResource/Controller.php
index a0697b436618045c33a032241765c8c086b4ce19..352e7bf2241555a708a22c923b5cd1c26cc2000f 100644
--- a/library/Class/DigitalResource/Controller.php
+++ b/library/Class/DigitalResource/Controller.php
@@ -25,38 +25,39 @@ class Class_DigitalResource_Controller extends ZendAfi_Controller_Action {
public function preDispatch() {
parent::preDispatch();
$this->_config = Class_DigitalResource_Config::getInstanceFromController(get_called_class());
+
if ($this->_config->getSsoAction() == $this->_request->getActionName())
- return $this->_forward('sso');
+ return $this->_forward('sso',
+ 'index',
+ $this->_config->getModuleName());
}
public function indexAction() {
- if(!Class_Users::isCurrentUserCanAccesBackend()) {
- return $this->_redirect($this->view->absoluteUrl(['module' => 'opac',
- 'controller' => 'auth',
- 'action' => 'ajax-login',
- 'location' => $this->_request->getModuleName()]));
- }
-
- $this->view->titre = $this->_config->getName();
- $this->view->records_count = Class_Album::countBy(['type_doc_id' => $this->_config->getDocType()]);
- }
+ if(!$user = Class_Users::getIdentity())
+ return $this->_javascriptAfterLoginRedirectTo($this->view->absoluteUrl(),
+ $this->_('Vous devez vous connecter pour accéder à cette page'));
+ if(!$user->isAdmin())
+ $this->_javascriptRedirectToIndex($this->_('Vous devez être connecté avec un compte adminitrateur pour accéder à cette page'));
- public function getExternalUri($album, $module_menu) {
- return $album->getExternalUri();
+ $this->view->titre = $this->_config->getName();
+ $this->view->config = $this->_config;
+ $this->getHelper('ViewRenderer')->renderScript('digital_resources/index.phtml');
}
public function ssoAction() {
- $module = $this->_config->getModuleMenu();
- $module = new $module($this->_config);
-
- $this->willRedirectToMe($module);
+ if(!$user = Class_Users::getIdentity())
+ return $this->_javascriptAfterLoginRedirectTo($this->view->absoluteUrl(),
+ $this->_('Vous devez vous connecter pour accéder à cette page'));
- if(!$album = Class_Album::find($this->_getParam('album_id', 0)))
- return $this->checkNotifyMessage($module, $module->getDynamiqueUrl());
+ $url = $this->_config->urlFor($user,
+ Class_Album::find($this->_getParam('album_id', 0)),
+ Class_Notice::find($this->_getParam('id', 0)));
- return $this->checkNotifyMessage($module, $this->getExternalUri($album, $module));
+ return $url
+ ? $this->_javascriptRedirectTo($url)
+ : $this->_javascriptRedirectToIndex($this->_config->getNotAllowedMessage());
}
}
\ No newline at end of file
diff --git a/library/Class/DigitalResource/ModuleMenu.php b/library/Class/DigitalResource/ModuleMenu.php
index 0fbe9c988a5aa868423df78b3628ebc5228283e7..84df000ed3887483ff9b1b1937b2de68b68554a6 100644
--- a/library/Class/DigitalResource/ModuleMenu.php
+++ b/library/Class/DigitalResource/ModuleMenu.php
@@ -29,6 +29,7 @@ class Class_DigitalResource_ModuleMenu extends Class_Systeme_ModulesMenu_SSOAbst
$this->_config = $config;
$this->_type_module = $this->_config->getName();
$this->_libelle = $this->_config->getMenuLabel();
+ $this->setMessage($this->_config->getNotAllowedMessage());
}
@@ -42,20 +43,4 @@ class Class_DigitalResource_ModuleMenu extends Class_Systeme_ModulesMenu_SSOAbst
'controller' => 'modules',
'action' => $this->_config->getSsoAction()]);
}
-
-
- public function urlForUser($user) {
- if ($user
- && $this->_config->hasRightAccess($user)
- && $this->_config->isEnabled())
- return $this->getSsoUrl($user);
-
- $this->setMessage($this->_config->getNotAllowedMessage());
- return '';
- }
-
-
- protected function getSsoUrl($user) {
- return $this->_config->getSsoUrl($user);
- }
}
diff --git a/library/Class/Notice/Sso.php b/library/Class/Notice/Sso.php
index 2ab654de7a53433aa65d8006a60cad22ec9d6c32..124e52c57724203dd3b67fd7cd05f676997d2258 100644
--- a/library/Class/Notice/Sso.php
+++ b/library/Class/Notice/Sso.php
@@ -49,11 +49,11 @@ class Class_Notice_Sso extends Class_Entity {
}
- public function getModuleMenu() {
+ public function getConfig() {
if (!$this->isValid())
return null;
return Class_DigitalResource::getInstance()
- ->getModuleMenuFor($this->getFirstCatalogAgency());
+ ->configFor($this->getFirstCatalogAgency());
}
}
diff --git a/library/Class/Systeme/ModulesMenu/SSOAbstract.php b/library/Class/Systeme/ModulesMenu/SSOAbstract.php
index 0d0b0a91e934cc6ecbf2ea1d8ea813739e351978..d05d145a39509421e57161f17644c7084f0e3550 100644
--- a/library/Class/Systeme/ModulesMenu/SSOAbstract.php
+++ b/library/Class/Systeme/ModulesMenu/SSOAbstract.php
@@ -46,8 +46,11 @@ class Class_Systeme_ModulesMenu_SSOAbstract extends Class_Systeme_ModulesMenu_Nu
}
- public function getDynamiqueUrl() {
- return ($user = Class_Users::getIdentity())
+ public function getDynamiqueUrl($user = null) {
+ if(!$user)
+ $user = Class_Users::getIdentity();
+
+ return $user
? $this->urlForUser($user)
: $this->loginUrl();
}
diff --git a/library/ZendAfi/Controller/Action.php b/library/ZendAfi/Controller/Action.php
index 61122d29b7ef36c1235ba9aee857ca1fd52aa4b3..7944828b3b1e4e1ccd042b10152e9755b7a6b36e 100644
--- a/library/ZendAfi/Controller/Action.php
+++ b/library/ZendAfi/Controller/Action.php
@@ -111,7 +111,10 @@ class ZendAfi_Controller_Action extends Zend_Controller_Action {
}
- protected function _javascriptRedirectToReferrer() {
+ protected function _javascriptRedirectToReferrer($message = null) {
+ if($message)
+ $this->_helper->notify($message);
+
$this->getHelper('ViewRenderer')->renderScript('ajax_return.phtml');
}
@@ -283,6 +286,31 @@ class ZendAfi_Controller_Action extends Zend_Controller_Action {
return $this->_redirect($this->_request->getServer('HTTP_REFERER'));
}
+ $this->_javascriptRedirectTo($url);
+ }
+
+
+ protected function _javascriptAfterLoginRedirectTo($url, $message = null) {
+ $login_url = Class_Url::absolute(['module' => 'opac',
+ 'controller' => 'auth',
+ 'action' => 'login'],
+ null,
+ true);
+ $this->_javascriptRedirectTo(sprintf('%s?redirect=%s', $login_url, rawurlencode($url)),
+ $message);
+ }
+
+
+ protected function _javascriptRedirectToIndex($message = null) {
+ $this->_javascriptRedirectTo($this->view->absoluteUrl([], null, true),
+ $message);
+ }
+
+
+ protected function _javascriptRedirectTo($url, $message = null) {
+ if($message)
+ $this->_helper->notify($message);
+
$viewRenderer = $this->getHelper('ViewRenderer');
$viewRenderer->setNoRender();
$this->getResponse()->setHeader('Content-Type', 'text/html;charset=utf-8');
diff --git a/library/ZendAfi/View/Helper/DigitalResource/Dashboard.php b/library/ZendAfi/View/Helper/DigitalResource/Dashboard.php
new file mode 100644
index 0000000000000000000000000000000000000000..da5d8f85ca40d2cae00556d1ba5d8ad2f347e207
--- /dev/null
+++ b/library/ZendAfi/View/Helper/DigitalResource/Dashboard.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * Copyright (c) 2012-2017, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class ZendAfi_View_Helper_DigitalResource_Dashboard extends ZendAfi_View_Helper_BaseHelper {
+
+ protected
+ $_config,
+ $_permitted_groups;
+
+
+ public function DigitalResource_Dashboard($config) {
+ $this->_config = $config;
+ return implode([$this->_renderStatus(),
+ $this->_renderSettings(),
+ $this->_renderRights(),
+ $this->_renderSso(),
+ $this->_renderHarvest()]);
+ }
+
+
+ protected function _renderStatus() {
+ return implode([$this->_globalStatus(),
+ $this->_harvestStatus()]);
+ }
+
+
+ protected function _globalStatus() {
+ $label = $this->_('Désactivé');
+ $class = 'digital_connectors_status';
+
+ if ($this->_config->isEnabled()) {
+ $label = $this->_('Activé');
+ $class .= ' enabled';
+ }
+ return $this->view->button((new Class_Entity)
+ ->setText($label)
+ ->setAttribs(['disabled' => 'disabled',
+ 'onclick' => 'return;',
+ 'class' => $class]));
+ }
+
+
+ protected function _harvestStatus() {
+ if(!$batch = $this->_config->getBatch())
+ return '';
+
+ $label = $this->_('Moissonnage désactivé');
+ $class = 'digital_connectors_status';
+
+ if (Class_Batch::findFirstBy(['type' => $batch])) {
+ $label = $this->_('Moissonnage activé');
+ $class .= ' enabled';
+ }
+ return $this->view->button((new Class_Entity)
+ ->setText($label)
+ ->setAttribs(['disabled' => 'disabled',
+ 'onclick' => 'return;',
+ 'class' => $class]));
+ }
+
+
+ protected function _renderSettings() {
+ $description = (new Class_TableDescription('adminvars'))
+ ->addColumn($this->_('description'), 'description')
+ ->addColumn($this->_('Clef'), 'id')
+ ->addColumn($this->_('valeur'),
+ function($model)
+ {
+ return ($renderer = $model->getRenderer())
+ ? $renderer($model->getValeur(), $this->view)
+ : $this->view->adminVar($model);
+ })
+ ->addRowAction(function($model)
+ {
+ return $this->view->renderModelActions($model,
+ [['url' => ['module' => 'admin',
+ 'controller' => 'index',
+ 'action' => 'adminvaredit',
+ 'cle' => $model->getClef()],
+ 'icon' => 'edit',
+ 'anchorOptions' => ['data-popup' => true],
+ 'label' => $this->_('Modifier "%s"', $model->getClef())]]);
+ });
+
+ return
+ $this->_tag('h3', $this->_('Paramétrage'))
+ . $this->view->renderTable($description, $this->_config->getAdminVarsInstances(), ['sorter' => true]);
+ }
+
+
+ protected function _renderRights() {
+ $html = [$this->_tag('h3',$this->_('Gestion des droits'))];
+
+ if (!$this->_config->isEnabled()) {
+ $html [] = $this->_tag('p', $this->_('Veuillez activer la ressource pour pouvoir gérer les droits d\'accès des groupes'), ['class' => 'error']);
+ return implode($html);
+ }
+
+ if(!$permission_label = $this->_config->getPermissionLabel()) {
+ $html [] = $this->_tag('p', $this->_('Cette ressource ne prend pas en charge la gestion des droits'), ['class' => 'error']) ;
+ return implode($html);
+ }
+
+ $html [] = $this->_tag('p', $this->_('Nom de la permission à donner : "%s"', $permission_label));
+
+ $groups = new Storm_Collection(Class_UserGroup::findAll());
+ $this->_permitted_groups = array_filter(
+ $groups
+ ->select(function ($group)
+ {
+ $permission = $this->_config->getPermission();
+ return $group->hasPermissionOn($permission, $this->_config);
+ })
+ ->getArrayCopy());
+
+ if (empty($this->_permitted_groups)) {
+ $html [] = $this->_tag('p', $this->_('Aucun groupe n\'a de droits d\'accès à la ressources'), ['class' => 'error'])
+ . $this->view->tagAnchor($this->view->absoluteUrl(['module' => 'admin',
+ 'controller' => 'usergroup',
+ 'action' => 'index'],
+ null,
+ true),
+ $this->_('Gérer les groupes'),
+ ['target' => '_blank']);
+ return implode($html);
+ }
+
+ $usergroup_description = (new Class_TableDescription('usergroups'))
+ ->addColumn($this->_('Groupes qui ont accès à la ressource'),
+ 'libelle')
+ ->addColumn($this->_('Nombre de membres'),
+ function($model) { return $model->formatedCount();})
+ ->addRowAction(function($model)
+ {
+ return $this->view->renderModelActions($model,
+ [['url' => ['module' => 'admin',
+ 'controller' => 'usergroup',
+ 'action' => 'edit',
+ 'id' => $model->getId()],
+ 'icon' => 'edit',
+ 'anchorOptions' => ['data-popup' => true],
+ 'label' => $this->_('Modifier "%s"', $model->getLibelle())]]);
+
+ });
+
+ $html [] = $this->view->renderTable($usergroup_description, $this->_permitted_groups, ['sorter' => true]);
+
+ $count_user = 0;
+ foreach($this->_permitted_groups as $group)
+ $count_user += $group->formatedCount();
+
+ if (0 == $count_user)
+ $html [] = $this->_tag('p', $this->_('Aucun utilisateur rattaché aux groupes'), ['class' => 'error']);
+
+ return implode($html);
+ }
+
+
+ protected function _renderSso() {
+ $html = [$this->_tag('h3', $this->_('Diagnostic SSO'))];
+
+ if(!$this->_config->getSsoAction()) {
+ $html [] = $this->_tag('p', $this->_('Cette ressource ne prend pas en charge la connexion SSO'), ['class' => 'error']) ;
+ return implode($html);
+ }
+
+ if(!$this->_permitted_groups) {
+ $html [] = $this->_tag('p', $this->_('Veuillez configurer les droits de cette ressource pour obtenir une connexion SSO'), ['class' => 'error']);
+ return implode($html);
+ }
+
+ $login = $this->_config->getName() . '_test_user';
+ $user = ($user = Class_Users::findFirstBy(['login' => $login]))
+ ? $user
+ : Class_Users::newInstance(['login' => $login,
+ 'password' => $login]);
+
+ $user->save();
+
+ if(!$permission = Class_Permission::findFirstBy(['code' => $this->_config->getName()]))
+ return implode($html);
+
+ $group_name = $this->_config->getName() . '_test_group';
+ $group = ($group = Class_UserGroup::findFirstBy(['libelle' => $group_name]))
+ ? $group
+ : Class_UserGroup::newInstance(['libelle' => $group_name]);
+
+ $group->addUser($user)->save();
+ $permission->permitTo($group, new Class_Entity());
+
+ $html [] = $this->_tag('h5', $this->_('Groupe créé pour ce test'))
+ . $this->_tag('ul',
+ $this->_tag('li', $this->_('Nom : %s', $group->getLibelle())));
+
+ Class_Users::clearCache();
+ $user = Class_Users::find($user->getId());
+
+ $html [] = $this->_tag('h5', $this->_('Utilisateur créé pour ce test'))
+ . $this->_tag('ul',
+ $this->_tag('li', $this->_('Login : %s', $user->getLogin()))
+ . $this->_tag('li', $this->_('Mot de passe : %s', $user->getLogin()))
+ . $this->_tag('li', $this->_('Groupes : %s', implode(', ',$user->getUserGroupsLabels()))));
+
+ $html [] = $this->view->renderModelActions($user,
+ [['url' => ['module' => 'admin',
+ 'controller' => 'users',
+ 'action' => 'edit',
+ 'id' => $user->getId()],
+ 'icon' => 'edit',
+ 'anchorOptions' => ['data-popup' => true],
+ 'label' => $this->_('Modifier "%s"',
+ $user->getLogin())]]);
+
+ $url = $this->_config->urlFor($user);
+ $html [] = $this->_tag('h4', $this->_('URL SSO générée par /modules/%s pour l\'utilisateur "%s"',
+ $this->_config->getName(),
+ $user->getLogin()))
+ . $this->view->tagAnchor($url, $url, ['target' => '_blank']);
+
+ if(!$album = Class_Album::findFirstby(['type_doc_id' => $this->_config->getDocType()]))
+ return implode($html);
+
+ $album_url = $this->_config->urlFor($user, $album);
+ $html [] = $this->_tag('h4', $this->_('URL SSO générée pour l\'utilisateur "%s" et l\'album "%s"',
+ $user->getLogin(),
+ $album->getTitre())
+ . $this->view->tagAnchor(['module' => 'admin',
+ 'controller' => 'album',
+ 'action' => 'edit_album',
+ 'id' => $album->getId()], $this->_('Voir l\'album'),
+ ['style' => 'margin-left: 1em',
+ 'data-popup' => 'true']))
+ . $this->view->tagAnchor($album_url, $album_url, ['target' => '_blank']);
+
+ return implode($html);
+ }
+
+
+ protected function _renderHarvest() {
+ $html = [$this->_tag('h3', $this->_('Diagnostic moissonnage'))];
+
+ if(!$batch_name = $this->_config->getBatch()) {
+ $html [] = $this->_tag('p', $this->_('Cette ressource ne prend pas en charge le moissonnage'), ['class' => 'error']) ;
+ return implode($html);
+ }
+
+ if (!$this->_config->isEnabled()) {
+ $html [] = $this->_tag('p', $this->_('Veuillez activer la ressource pour pouvoir gérer le moissonage'), ['class' => 'error']);
+ return implode($html);
+ }
+
+ if(!$batch = Class_Batch::findFirstBy(['type' => $batch_name])) {
+ $html [] = $this->_tag('p', $this->_('Le moissonnage n\'est pas programmé'), ['class' => 'error'])
+ . $this->view->button((new Class_Entity())
+ ->setText($this->_('Activer le moissonnage'))
+ ->setUrl($this->view->absoluteUrl(['module' => 'admin',
+ 'controller' => 'batch',
+ 'action' => 'activate',
+ 'id' => $batch_name],
+ null,
+ true)));
+ }
+
+ $description = (new Class_TableDescription('batchs'))
+ ->addColumn($this->_('Batch'), function($model) { return $model->getLabel(); })
+ ->addColumn($this->_('Planification'),
+ function($model)
+ {
+ return (new Class_Repeat_WeekDays())->humanReadable($model->getPickDay());
+ })
+ ->addColumn($this->_('Dernière exécution'), function($model) { return $model->getLastRun(); })
+ ->addRowAction(function($model)
+ {
+ return $this->view->renderModelActions($model,
+ [
+ ['url' => '/admin/batch/delete/id/%s',
+ 'icon' => 'show',
+ 'label' => $this->_('Désactiver la tâche'),
+ 'condition' => function($model)
+ {
+ return $model->isDeletable();
+ },
+ 'anchorOptions' =>
+ ['onclick' => 'return confirm(\''
+ . str_replace(['\'', '"'], '\\\'',
+ $this->_('Etes-vous sur de vouloir désactiver cette tâche ?'))
+ . '\')']],
+
+ ['url' => '/admin/batch/plan/id/%s',
+ 'icon' => 'calendar',
+ 'label' => $this->_('Plannifier la tâche'),
+ 'condition' => function($model) {
+ return Class_Users::isCurrentUserSuperAdmin()
+ && $model->isActive();
+ },
+ 'anchorOptions' => ['data-popup' => 'true']],]);
+ });
+
+ $albums_link = ($cat = Class_AlbumCategorie::findFirstBy(['libelle' => $this->_config->getDocTypeLabel()]))
+ ? $this->view->tagAnchor($this->view->absoluteUrl(['module' => 'admin',
+ 'controller' => 'album',
+ 'action' => 'index',
+ 'cat_id' => $cat->getId()], null, true),
+ $this->_('Voir les albums'),
+ ['target' => '_blank'])
+ : '';
+
+ if($batch)
+ $html [] = $this->view->renderTable($description, [new Class_Batch_Definition($this->_config->getBatchInstance())]);
+
+ $html [] = ($count = Class_Album::countBy(['type_doc_id' => $this->_config->getDocType()]))
+ ? $this->_tag('p',
+ $this->_('Nombre d\'albums présents : %d', $count))
+ . $albums_link
+ : $this->_tag('p', $this->_('Aucun album présent pour cette ressource'), ['class' => 'error']);
+
+ return implode($html);
+ }
+}
\ No newline at end of file
diff --git a/library/digital_resources/Assimil/tests/AssimilTest.php b/library/digital_resources/Assimil/tests/AssimilTest.php
index b49d2615036fb3d5008d42024625956334c4cb1a..3ee14ec548176c032cdb10647208f44deeda9f00 100644
--- a/library/digital_resources/Assimil/tests/AssimilTest.php
+++ b/library/digital_resources/Assimil/tests/AssimilTest.php
@@ -23,11 +23,12 @@
class AssimilAdminVars {
public static function activate() {
- Class_AdminVar::newInstanceWithId('Assimil_Assimil', ['valeur' => '1'])->save();
+ Class_AdminVar::set('Assimil_Assimil', '1');
+ Class_AdminVar::set('SSO_URL', '1');
}
public static function deactivate() {
- Class_AdminVar::newInstanceWithId('Assimil_Assimil', ['valeur' => '0'])->save();
+ Class_AdminVar::set('Assimil_Assimil', '0');
}
}
@@ -497,14 +498,53 @@ class AssimilAjaxRecordWithLoggedUserDispatchTest extends AssimilAjaxRecordTestC
class AssimilModuleIndexControllerTest extends AbstractControllerTestCase {
-
protected $_storm_default_to_volatile = true;
+ public function setUp() {
+ parent::setUp();
+
+ $this->fixture('Class_AdminVar',
+ ['id' => 'Assimil_Assimil',
+ 'valeur' => 1]);
+
+ $this->fixture('Class_AdminVar',
+ ['id' => 'Assimil_SSO_URL',
+ 'valeur' => '']);
+
+ $user = $this->fixture('Class_Users',
+ ['id' => 56,
+ 'login' => 'Pierre',
+ 'password' => 'eCRTY']);
+
+ $group = $this->fixture('Class_UserGroup',
+ ['id' => 1,
+ 'libelle' => 'Assimil accès'])
+ ->addUser($user);
+
+ $this->fixture('Class_Permission',
+ ['id' => 1,
+ 'code' => 'Assimil'])
+ ->permitTo($group,
+ new Class_Entity());
+
+ $this->fixture('Class_AlbumCategorie',
+ ['id' => 2,
+ 'libelle' => 'ASSIMIL e-méthode',
+ ]);
+
+ $this->fixture('Class_Album',
+ ['id' => 1,
+ 'titre' => 'album assimil',
+ 'type_doc_id' => 'Assimil',
+ 'cat_id' => 2
+ ]);
+ }
+
/** @test */
public function indexActionShouldContainsNumberOfAlbums() {
$this->dispatch('/Assimil_Plugin/index', true);
- $this->assertXPathContentContains('//div/p', 'Nombre d\'albums présents : 0', $this->_response->getBody());
+ $this->assertXPathContentContains('//p', 'Nombre d\'albums présents : 1');
}
@@ -517,17 +557,22 @@ class AssimilModuleIndexControllerTest extends AbstractControllerTestCase {
/** @test */
public function assimilActionShouldRedirect() {
+ ZendAfi_Auth::getInstance()->logUser($this->fixture('Class_Users',
+ ['id' => 987,
+ 'login' => 'Thomas',
+ 'password' => 'yuioO']));
+
$this->dispatch('/Assimil_Plugin/index/assimil', true);
$this->assertFlashMessengerContentContains('Vous n\'avez pas accès à cette ressource.');
- $this->assertRedirect();
+ $this->assertXPathContentContains('//script', 'document.location.href="http://');
}
/** @test */
- public function noLoggedUserShouldRedirectToAjaxLogin() {
+ public function noLoggedUserShouldRedirectToLogin() {
ZendAfi_Auth::getInstance()->clearIdentity();
$this->dispatch('/Assimil_Plugin', true);
- $this->assertRedirectTo('http://localhost' . BASE_URL . '/auth/ajax-login/location/Assimil_Plugin');
+ $this->assertXPathContentContains('//script', '/auth/login?redirect=');
}
}
diff --git a/library/digital_resources/Assimil/views/scripts/index/index.phtml b/library/digital_resources/Assimil/views/scripts/index/index.phtml
deleted file mode 100644
index 94021ac7cecad7d8812b4bb7964fca6366e173d8..0000000000000000000000000000000000000000
--- a/library/digital_resources/Assimil/views/scripts/index/index.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-echo $this->tag('p',
- $this->_('Nombre d\'albums présents : %s',$this->records_count)); ?>
diff --git a/library/digital_resources/Bibliondemand/Config.php b/library/digital_resources/Bibliondemand/Config.php
index d630edb866be187c8b42d39ecbbab934910487b0..6e6db0730c853e5c49510fd674b13a0bce4fbd5f 100644
--- a/library/digital_resources/Bibliondemand/Config.php
+++ b/library/digital_resources/Bibliondemand/Config.php
@@ -50,8 +50,19 @@ class Bibliondemand_Config extends Class_DigitalResource_Config {
}
+ public function getRecordSsoUrl($user, $record) {
+ if(!$record)
+ return;
+
+ $url = Class_AdminVar::getValueOrDefault($this->withNameSpace('SSO_URL'));
+
+ return ($record_url = (new Class_Notice_Sso($record))->getFirstPrivateUrl())
+ ? $url . '&' . http_build_query(['returnUrl' => $record_url])
+ : $url;
+ }
+
+
public function isEnabled() {
return '' != $this->getAdminVar('SSO_URL');
}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/library/digital_resources/Bibliondemand/ModuleMenu.php b/library/digital_resources/Bibliondemand/ModuleMenu.php
index ec498e46052901ae00fe7c5596c403ef0f07fcb1..64f577f560ed491b76f7adcb4037a4803cae4127 100644
--- a/library/digital_resources/Bibliondemand/ModuleMenu.php
+++ b/library/digital_resources/Bibliondemand/ModuleMenu.php
@@ -21,21 +21,4 @@
class Bibliondemand_ModuleMenu extends Class_DigitalResource_ModuleMenu {
- protected $_record;
-
- protected function getSsoUrl($user) {
- $url = parent::getSsoUrl($user);
-
- if (!$this->_record
- || (!$record_url = $this->_record->getFirstPrivateUrl()))
- return $url;
-
- return $url . '&' . http_build_query(['returnUrl' => $record_url]);
- }
-
-
- public function setRecord($record) {
- $this->_record = $record;
- return $this;
- }
}
\ No newline at end of file
diff --git a/library/digital_resources/Bibliondemand/controllers/IndexController.php b/library/digital_resources/Bibliondemand/controllers/IndexController.php
index f3b3a6cb909d45470738be014c9db09d308157eb..5473618b34b16d4ca55a021adcee2ed9f911946f 100644
--- a/library/digital_resources/Bibliondemand/controllers/IndexController.php
+++ b/library/digital_resources/Bibliondemand/controllers/IndexController.php
@@ -21,14 +21,4 @@
class Bibliondemand_Plugin_IndexController extends Class_DigitalResource_Controller {
- public function ssoAction() {
- $module = $this->_config->getModuleMenu();
- $module = new $module($this->_config);
-
- if(!$url = $module->urlForUser(Class_Users::getIdentity()))
- return $this->willRedirectToMe($module)
- ->checkNotifyMessage($module, $module->getDynamiqueUrl());
-
- return $this->checkNotifyMessage($module, $url);
- }
}
\ No newline at end of file
diff --git a/library/digital_resources/Bibliondemand/tests/BibliondemandTest.php b/library/digital_resources/Bibliondemand/tests/BibliondemandTest.php
index 41c58b936ee000cb1d1b4596b1777e1879786e96..6299df05f5555e0d857effa207e33b549f849ccf 100644
--- a/library/digital_resources/Bibliondemand/tests/BibliondemandTest.php
+++ b/library/digital_resources/Bibliondemand/tests/BibliondemandTest.php
@@ -48,8 +48,6 @@ class BibliondemandModulesControllerTest extends AbstractControllerTestCase {
->beAbonneSIGB());
$this->dispatch('/opac/modules/bibliondemand', true);
-
$this->assertXpathContentContains('//script', 'document.location.href="https://biblio.org";');
}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/library/digital_resources/Capturator/tests/CapturatorTest.php b/library/digital_resources/Capturator/tests/CapturatorTest.php
index f79ba50f1543faed92857eb4cd9fd815f0316c40..392528143171994b023ca2d5203b5915d9fa15e7 100644
--- a/library/digital_resources/Capturator/tests/CapturatorTest.php
+++ b/library/digital_resources/Capturator/tests/CapturatorTest.php
@@ -86,5 +86,4 @@ class CapturatorModulesControllerTest extends AbstractControllerTestCase {
$this->assertContains('Bibliothèque numérique: accéder aux formations Capturator',
Class_DigitalResource::getInstance()->getPermissionsLabel());
}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/library/digital_resources/LaSourisQuiRaconte/Config.php b/library/digital_resources/LaSourisQuiRaconte/Config.php
index 5fead2c3a42e557ec1e4599b20c6d314547b5405..7d86b828288694ee0018bda60259deb1d66c2b97 100644
--- a/library/digital_resources/LaSourisQuiRaconte/Config.php
+++ b/library/digital_resources/LaSourisQuiRaconte/Config.php
@@ -62,10 +62,16 @@ class LaSourisQuiRaconte_Config extends Class_DigitalResource_Config {
'controller' => 'auth',
'action' => 'validate',
'ticket' => (new Class_CasTicket())->getTicketForCurrentUser()]);
+
return static::LSQR_URL . '/espaces/bokeh_verif.php?url_controle=' . $url;
}
+ public function getAlbumSsoUrl($user, $album) {
+ return $this->getSsoUrl($user) . '&redirect_id=' . $album->getIdOrigine();
+ }
+
+
public function getExportUrl() {
return static::LSQR_URL . '/espaces/export_bokeh.php?token=bokeh_export';
}
diff --git a/library/digital_resources/LaSourisQuiRaconte/ModuleMenu.php b/library/digital_resources/LaSourisQuiRaconte/ModuleMenu.php
index 95813b355bfc2a9bdbdf2041f18a58593af1c76e..e6baf6bbb68f0cd798f51f31ab008bfcaa61fced 100644
--- a/library/digital_resources/LaSourisQuiRaconte/ModuleMenu.php
+++ b/library/digital_resources/LaSourisQuiRaconte/ModuleMenu.php
@@ -20,5 +20,4 @@
*/
-class LaSourisQuiRaconte_ModuleMenu extends Class_DigitalResource_ModuleMenu {
-}
\ No newline at end of file
+class LaSourisQuiRaconte_ModuleMenu extends Class_DigitalResource_ModuleMenu {}
\ No newline at end of file
diff --git a/library/digital_resources/LaSourisQuiRaconte/controllers/IndexController.php b/library/digital_resources/LaSourisQuiRaconte/controllers/IndexController.php
index ce5c802f15b8de102cfd8f5aa11030bad1ace0ad..4527967e23fdc0648598b57b5b6821f60ae6ecb6 100644
--- a/library/digital_resources/LaSourisQuiRaconte/controllers/IndexController.php
+++ b/library/digital_resources/LaSourisQuiRaconte/controllers/IndexController.php
@@ -21,7 +21,4 @@
class LaSourisQuiRaconte_Plugin_IndexController extends Class_DigitalResource_Controller {
- public function getExternalUri($album, $module_menu) {
- return $module_menu->getDynamiqueUrl() . '&redirect_id=' . $album->getIdOrigine();
- }
}
\ No newline at end of file
diff --git a/library/digital_resources/Musicme/Config.php b/library/digital_resources/Musicme/Config.php
index 5c4ca076c5b7fe04606afcf99870bb56d72d1bc7..e608a63d0b2821b148b2e7393112c2708f840fb1 100644
--- a/library/digital_resources/Musicme/Config.php
+++ b/library/digital_resources/Musicme/Config.php
@@ -64,6 +64,16 @@ class Musicme_Config extends Class_DigitalResource_Config {
}
+ public function getAlbumSsoUrl($user, $album) {
+ $sso_url = explode('?', $this->getSsoUrl($user));
+
+ return str_replace('http://www.musicme.com',
+ $sso_url[0],
+ str_replace('"','%22',$album->getExternalUri()))
+ . '?' . (isset($sso_url[1]) ? $sso_url[1] : '');
+ }
+
+
public function isEnabled() {
return '' != $this->getAdminVar('BIB_ID');
}
diff --git a/library/digital_resources/Musicme/controllers/IndexController.php b/library/digital_resources/Musicme/controllers/IndexController.php
index d97e079214695af9d7fe8091082a9a95246832ca..2f47604c4dcce6ff9a7fdc9559132f43896e4599 100644
--- a/library/digital_resources/Musicme/controllers/IndexController.php
+++ b/library/digital_resources/Musicme/controllers/IndexController.php
@@ -20,13 +20,4 @@
*/
-class Musicme_Plugin_IndexController extends Class_DigitalResource_Controller {
- public function getExternalUri($album, $module_menu) {
- $sso_url = explode('?', $module_menu->getDynamiqueUrl());
-
- return str_replace('http://www.musicme.com',
- $sso_url[0],
- str_replace('"','%22',$album->getExternalUri()))
- . '?' . (isset($sso_url[1]) ? $sso_url[1] : '');
- }
-}
\ No newline at end of file
+class Musicme_Plugin_IndexController extends Class_DigitalResource_Controller {}
\ No newline at end of file
diff --git a/library/digital_resources/Musicme/tests/MusicmeTest.php b/library/digital_resources/Musicme/tests/MusicmeTest.php
index 4d08407bf837973d9cd3ddd0ca8c7014b4595275..28cb380510bb9f90ca14f0ddf3de8f7b27c1927c 100644
--- a/library/digital_resources/Musicme/tests/MusicmeTest.php
+++ b/library/digital_resources/Musicme/tests/MusicmeTest.php
@@ -260,7 +260,8 @@ class CasServerControllerMusicmeValidateActionTest extends AbstractControllerTes
public function musicmeUrlShouldContainsTicket0a1b2c3d() {
$expected_ticket = 'ST-'.md5(Zend_Session::getId().'1');
$musicme = Class_DigitalResource::getInstance()->getModuleMenuFor('Musicme');
- $this->assertEquals('http://linkmusicme.com?iduser=tom&ticket='.$expected_ticket.'&MediaLibraryID=QUEST&service=http%3A%2F%2Flinkmusicme.com%3Fiduser%3Dtom%26ticket%3D'.$expected_ticket.'%26MediaLibraryID%3DQUEST', Class_DigitalResource::getInstance()->getModuleMenuFor('Musicme')->getDynamiqueUrl());
+ $this->assertEquals('http://linkmusicme.com?iduser=tom&ticket='.$expected_ticket.'&MediaLibraryID=QUEST&service=http%3A%2F%2Flinkmusicme.com%3Fiduser%3Dtom%26ticket%3D'.$expected_ticket.'%26MediaLibraryID%3DQUEST',
+ Musicme_Config::getInstance()->getSsoUrl(Class_Users::getIdentity()));
}
diff --git a/library/digital_resources/Omeka/controllers/IndexController.php b/library/digital_resources/Omeka/controllers/IndexController.php
new file mode 100644
index 0000000000000000000000000000000000000000..6534055cd988484986077de87caeb40bf78de8a8
--- /dev/null
+++ b/library/digital_resources/Omeka/controllers/IndexController.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class Omeka_Plugin_IndexController extends Class_DigitalResource_Controller {}
\ No newline at end of file
diff --git a/library/digital_resources/Skilleos/Config.php b/library/digital_resources/Skilleos/Config.php
index 5ab8bd63cff11cfbab2c03130b4aaf5d0c0c0510..0d5a34b0d6f5592b8c3c13e9a6171682233e09d1 100644
--- a/library/digital_resources/Skilleos/Config.php
+++ b/library/digital_resources/Skilleos/Config.php
@@ -50,13 +50,28 @@ class Skilleos_Config extends Class_DigitalResource_Config {
public function getSsoUrl($user) {
- $module = $this->getDigitalResource()
- ->getModuleNameFor($this->getName());
+ return $this->_getSsoUrl($user, null);
+ }
+
+
+ public function getAlbumSsoUrl($user, $album) {
+ if(!$album)
+ return;
- return static::SKILLEOS_URL . '?casid='.$this->getAdminVar('BIB_ID'). '&ticket='.(new Class_CasTicket())->getTicketForCurrentUser();
+ return $this->_getSsoUrl($user, $album);
}
+ protected function _getSsoUrl($user, $album) {
+ $id = $album
+ ? $album->getIdOrigine()
+ : '';
+
+ return static::SKILLEOS_URL . $id
+ . '?casid='.$this->getAdminVar('BIB_ID')
+ . '&ticket='.(new Class_CasTicket())->getTicketForUser($user);
+ }
+
public function isEnabled() {
return '' != $this->getAdminVar('BIB_ID');
diff --git a/library/digital_resources/Skilleos/ModuleMenu.php b/library/digital_resources/Skilleos/ModuleMenu.php
index a640caa41719777fb50e90ade7f72ace3ac1878e..1a255ccd94acf743ecd8bcc56d5f25c33b1d91b3 100644
--- a/library/digital_resources/Skilleos/ModuleMenu.php
+++ b/library/digital_resources/Skilleos/ModuleMenu.php
@@ -21,5 +21,3 @@
class Skilleos_ModuleMenu extends Class_DigitalResource_ModuleMenu {}
-
-?>
\ No newline at end of file
diff --git a/library/digital_resources/Skilleos/controllers/IndexController.php b/library/digital_resources/Skilleos/controllers/IndexController.php
index 0d1d4a798c9e8ed926a9e176cd58f2a5429f40d2..a43b5c087b2d981c9e456b4ca719d6d460c18e58 100644
--- a/library/digital_resources/Skilleos/controllers/IndexController.php
+++ b/library/digital_resources/Skilleos/controllers/IndexController.php
@@ -20,11 +20,4 @@
*/
-class Skilleos_Plugin_IndexController extends Class_DigitalResource_Controller {
- public function getExternalUri($album,$module) {
- return str_replace('?casid',
- $album->getIdOrigine() . '?casid',
- $module->getDynamiqueUrl());
- }
-}
-?>
\ No newline at end of file
+class Skilleos_Plugin_IndexController extends Class_DigitalResource_Controller {}
\ No newline at end of file
diff --git a/library/digital_resources/Skilleos/tests/SkilleosTest.php b/library/digital_resources/Skilleos/tests/SkilleosTest.php
index aab43ac3bf470f6197159e7b0244a44a8c807a7b..2a47f6c71545f2a9b53db6595bd9b46b1e611397 100644
--- a/library/digital_resources/Skilleos/tests/SkilleosTest.php
+++ b/library/digital_resources/Skilleos/tests/SkilleosTest.php
@@ -320,11 +320,10 @@ class SkilleosServiceHarvestTest extends SkilleosServiceTestCase {
/** @test */
public function withAlbumIdShouldRedirectToSkilleos() {
- $this->dispatch('/opac/modules/skilleos/album_id/2');
+ $this->dispatch('/opac/modules/skilleos/album_id/2',true);
$ticket = (new Class_CasTicket())->getTicketForCurrentUser();
$this->assertXPathContentContains('//script','/sigb/sso/602?casid=QUEST&ticket='.$ticket, $this->_response->getBody());
}
-
}
diff --git a/library/digital_resources/Skilleos/views/scripts/index/index.phtml b/library/digital_resources/Skilleos/views/scripts/index/index.phtml
deleted file mode 100644
index 84b24a2342e14a518bec06a2c64f3d28354143b6..0000000000000000000000000000000000000000
--- a/library/digital_resources/Skilleos/views/scripts/index/index.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-echo $this->tag('p',
- $this->_('Nombre d\'albums présents : %s',$this->records_count)); ?>
diff --git a/public/admin/skins/bokeh74/global.css b/public/admin/skins/bokeh74/global.css
index 122c9e62697d451698ffd7e4359b5301775235a8..ed171cda6b3e45f07207e82f559272b7f780fc04 100755
--- a/public/admin/skins/bokeh74/global.css
+++ b/public/admin/skins/bokeh74/global.css
@@ -36,7 +36,9 @@ body {
}
.redmine_status.redmine_green,
-.modules .digital_connectors div.enabled {
+body .digital_connectors_status.enabled,
+body .digital_connectors_status.enabled:focus,
+body .digital_connectors_status.enabled:hover {
background-color: var(--success-background);
}
@@ -586,10 +588,8 @@ table {
}
-.modules .digital_connectors div.enabled {
- width: 200px;
- padding: 5px;
- text-align: center;
+.digital_connectors_status {
+ min-width: 150px;
}
.pager {
@@ -1035,5 +1035,4 @@ table#logs img {
#learn_more button:focus,
#learn_more button:hover {
background-color:var(--bokeh-event-highlight);
-}
-
+}
\ No newline at end of file
diff --git a/tests/application/modules/admin/controllers/BibnumControllerTest.php b/tests/application/modules/admin/controllers/BibnumControllerTest.php
index 4b3df0cc9bf77c9fb30f7b8ea9b859f976d07853..622e2a788800961e0de234fba9cd077a54466479 100644
--- a/tests/application/modules/admin/controllers/BibnumControllerTest.php
+++ b/tests/application/modules/admin/controllers/BibnumControllerTest.php
@@ -65,7 +65,7 @@ class Admin_BibnumControllerIndexTest extends Admin_AbstractControllerTestCase {
/** @test */
public function oneDTouchShouldBeEnabled() {
- $this->assertXPathContentContains('//table[@class="digital_connectors"]//tr[@data-code="onedtouch"]/td//div[@class="enabled"]',
+ $this->assertXPathContentContains('//table[@class="digital_connectors"]//tr[@data-code="onedtouch"]/td//button[contains(@class, "enabled")]',
'Activé');
}
@@ -96,9 +96,15 @@ class Admin_BibnumControllerIndexTest extends Admin_AbstractControllerTestCase {
/** @test */
public function biliondemandShouldBeEnabled() {
- $this->assertXPathContentContains('//table[@class="digital_connectors"]//tr[@data-code="bibliondemand"]/td//div[@class="enabled"]',
+ $this->assertXPathContentContains('//table[@class="digital_connectors"]//tr[@data-code="bibliondemand"]/td//button[contains(@class, "enabled")]',
'Activé');
}
+
+
+ /** @test */
+ public function biliondemandDashBordShouldBePresent() {
+ $this->assertXPathContentContains('//table[@class="digital_connectors"]//tr[@data-code="bibliondemand"]/td//button', 'Tableau de bord');
+ }
}