diff --git a/VERSIONS_HOTLINE/87795 b/VERSIONS_HOTLINE/87795 new file mode 100644 index 0000000000000000000000000000000000000000..c9c9947bce871cfd5b94a2f1aa9cc82d7bfc36a4 --- /dev/null +++ b/VERSIONS_HOTLINE/87795 @@ -0,0 +1 @@ + - ticket #87795 : Newsletter : Correction de la sélection d'article qui n'incluait que le premier article sélectionné. \ No newline at end of file diff --git a/VERSIONS_HOTLINE/87844 b/VERSIONS_HOTLINE/87844 new file mode 100644 index 0000000000000000000000000000000000000000..55b482237b903436acd1e7d9dc7278fc5fdbd4e7 --- /dev/null +++ b/VERSIONS_HOTLINE/87844 @@ -0,0 +1 @@ + - ticket #87844 : correctif lien footer de base passé en https (ainsi que tous les liens vers bokeh-library-portal.org). \ No newline at end of file diff --git a/VERSIONS_HOTLINE/88226 b/VERSIONS_HOTLINE/88226 new file mode 100644 index 0000000000000000000000000000000000000000..63c7276faf8178365eb8882887691932bc478caa --- /dev/null +++ b/VERSIONS_HOTLINE/88226 @@ -0,0 +1,2 @@ + - ticket #88226 : SIGB VSmart : ajout du message "Demande en cours" dans la prise en charge des statuts d'exemplaires. + \ No newline at end of file diff --git a/VERSIONS_HOTLINE/88295 b/VERSIONS_HOTLINE/88295 new file mode 100644 index 0000000000000000000000000000000000000000..2396849e37b494773028edcb40dde1445076bd24 --- /dev/null +++ b/VERSIONS_HOTLINE/88295 @@ -0,0 +1,2 @@ + - ticket #88295 : Administration : correction des liens concernant les activités dans l'écran de modification des sessions + \ No newline at end of file diff --git a/VERSIONS_HOTLINE/88412 b/VERSIONS_HOTLINE/88412 new file mode 100644 index 0000000000000000000000000000000000000000..9598586f06ab61e3d134426857efeef0192b35ca --- /dev/null +++ b/VERSIONS_HOTLINE/88412 @@ -0,0 +1,2 @@ + - ticket #88412 : Administration : correction de l'enregistrement des formulaires ou la valeur des éléments de type radio comporte des accents + \ No newline at end of file diff --git a/VERSIONS_HOTLINE/88484 b/VERSIONS_HOTLINE/88484 new file mode 100644 index 0000000000000000000000000000000000000000..c373afb648deef72033b76844b08d28694ce62bc --- /dev/null +++ b/VERSIONS_HOTLINE/88484 @@ -0,0 +1,2 @@ + - ticket #88484 : Administration : correction de la prise en charge de la variable JS STAT. + \ No newline at end of file diff --git a/application/modules/admin/views/scripts/activity/_activity_actions.phtml b/application/modules/admin/views/scripts/activity/_activity_actions.phtml index ca6054c6a5b479d4149a2f0e860af6c952b3ada7..22d548a54aeffedabd058e0de07c1cdcdacc3ec0 100644 --- a/application/modules/admin/views/scripts/activity/_activity_actions.phtml +++ b/application/modules/admin/views/scripts/activity/_activity_actions.phtml @@ -1,11 +1,13 @@ <div class='actions'> <?php - echo $this->tagAnchor(['action' => 'edit', + echo $this->tagAnchor(['controller' => 'activity', + 'action' => 'edit', 'id' => $this->activity->getId()], $this->boutonIco("type=edit", 'bulle='.$this->_('Modifier l\'activité'))); - echo $this->tagAnchor(['action' => ($this->activity->isVisible() ? 'hide' : 'show'), + echo $this->tagAnchor(['controller' => 'activity', + 'action' => ($this->activity->isVisible() ? 'hide' : 'show'), 'id' => $this->activity->getId()], $this->boutonIco('picto=' . ($this->activity->isVisible() ? 'show' : 'hide'), 'bulle=' . ($this->activity->isVisible() ? $this->_('Cacher') : $this->_('Afficher')))); @@ -17,7 +19,8 @@ 'bulle='.$this->_('Ajouter une session'))); if (!$this->activity->hasSessions()) - echo $this->tagAnchor(['action' => 'delete', + echo $this->tagAnchor(['controller' => 'activity', + 'action' => 'delete', 'id' => $this->activity->getId()], $this->boutonIco("type=del", 'bulle='.$this->_('Supprimer l\'activité'))); diff --git a/application/modules/admin/views/scripts/index/index.phtml b/application/modules/admin/views/scripts/index/index.phtml index 18a4cacdfe731ff57f763c10060734e2226481ba..3d187193849d2ef5d8cff4ff03a30e0942ffd874 100644 --- a/application/modules/admin/views/scripts/index/index.phtml +++ b/application/modules/admin/views/scripts/index/index.phtml @@ -1,4 +1,3 @@ - <?php $skin = Class_Admin_Skin::current(); @@ -77,10 +76,10 @@ foreach ($modstats as $stat) { <h2><?php echo $this->_('Participez à la communauté'); ?> !</h2> <div class='ligne_info'> - <a onclick="window.open(this.href); return false" href="http://bokeh-library-portal.org"><?php echo $this->_('Site communautaire');?></a> - + <a onclick="window.open(this.href); return false" href="https://bokeh-library-portal.org"><?php echo $this->_('Site communautaire');?></a> - <a onclick="window.open(this.href); return false" href="https://groups.google.com/group/utilisateurs-bokeh"><?php echo $this->_('Google group Bokeh');?></a> - <a onclick="window.open(this.href); return false" href="http://wiki.bokeh-library-portal.org"><?php echo $this->_('Wiki Bokeh');?></a> - -<a onclick="window.open(this.href); return false" href="http://git.afi-sa.fr/afi/opacce/tree/master"><?php echo $this->_('Code source');?></a> +<a onclick="window.open(this.href); return false" href="https://git.afi-sa.net/afi/opacce/tree/master"><?php echo $this->_('Code source');?></a> </div> <h2><?php echo $this->_('Salle de discussion #Bokeh'); ?> :</h2> diff --git a/library/Class/CustomField/Value.php b/library/Class/CustomField/Value.php index e4a740744ea79ec49ee0535f74a481e78a8ad8a5..72f43bb3c1a9d928435fb4a5256574b4bf99b6f5 100644 --- a/library/Class/CustomField/Value.php +++ b/library/Class/CustomField/Value.php @@ -87,7 +87,5 @@ class Class_CustomField_Value extends Storm_Model_Abstract { return $options; return [$this->getValue()]; - } } -?> diff --git a/library/Class/Newsletter.php b/library/Class/Newsletter.php index ca407e7229b8b3731c5876cb215e7ab9e4be616e..632ffeef493db4d5561b683d43f043a9bfaf37d2 100644 --- a/library/Class/Newsletter.php +++ b/library/Class/Newsletter.php @@ -225,12 +225,17 @@ class Class_Newsletter extends Storm_Model_Abstract { public function getArticles() { $articles = []; - foreach (Class_ArticleCategorie::findAllBy(['id_cat' => $this->getArticlesCategoriesIds()]) as $categorie) + foreach (Class_ArticleCategorie::findAllBy(['id_cat' => $this->_idsFrom($this->getArticlesCategoriesIds())]) as $categorie) $articles = array_merge($articles, $categorie->getArticles()); return array_merge($articles, - Class_Article::findAllBy(['id_article' => $this->getArticlesIds()])); + Class_Article::findAllBy(['id_article' => $this->_idsFrom($this->getArticlesIds())])); + } + + + protected function _idsFrom($selection) { + return explode('-', $selection); } diff --git a/library/Class/WebService/SIGB/VSmart/SearchResponseReader.php b/library/Class/WebService/SIGB/VSmart/SearchResponseReader.php index 8ef9e31de7b946cb9964eab54f592f2be9b476e5..42a7917c5e261ea984f4261764a7d373d1f2f0cc 100644 --- a/library/Class/WebService/SIGB/VSmart/SearchResponseReader.php +++ b/library/Class/WebService/SIGB/VSmart/SearchResponseReader.php @@ -38,7 +38,8 @@ class Class_WebService_SIGB_VSmart_SearchResponseReader extends Class_WebService '28' => 'Pilon', '29' => 'Exclu du prêt', '30' => 'En commande', - '31' => 'A l\'équipement']; + '31' => 'A l\'équipement', + '66' => 'Demande en cours']; public static function newInstance() { return new self(); diff --git a/library/ZendAfi/Form/Admin/CustomFields/ModelValues.php b/library/ZendAfi/Form/Admin/CustomFields/ModelValues.php index b36aabbdd9c205e9658ba4dc79768736a68f57bd..d8235832c41377ce027695fbe3ec644fe4cd5111 100644 --- a/library/ZendAfi/Form/Admin/CustomFields/ModelValues.php +++ b/library/ZendAfi/Form/Admin/CustomFields/ModelValues.php @@ -121,6 +121,7 @@ class ZendAfi_Form_Admin_CustomFields_ModelValues_Field_Strategy_ckeditor extend class ZendAfi_Form_Admin_CustomFields_ModelValues_Field_Strategy_select extends ZendAfi_Form_Admin_CustomFields_ModelValues_Field_Strategy { + protected function getOptions() { $options = $this->_field->getOptionsListAsArray(); $multioptions=[]; @@ -136,12 +137,14 @@ class ZendAfi_Form_Admin_CustomFields_ModelValues_Field_Strategy_select extends class ZendAfi_Form_Admin_CustomFields_ModelValues_Field_Strategy_multiCheckbox extends ZendAfi_Form_Admin_CustomFields_ModelValues_Field_Strategy { + protected function getOptions() { $options = $this->_field->getOptionsListAsArray(); $multioptions=[]; foreach($options as $option) { $multioptions[$option]=$option; } + return ['multioptions' => $multioptions]; } @@ -149,7 +152,4 @@ class ZendAfi_Form_Admin_CustomFields_ModelValues_Field_Strategy_multiCheckbox e public function unserialize($value) { return $value ? explode(';', $value) : []; } - -} - -?> +} \ No newline at end of file diff --git a/library/ZendAfi/View/Helper/FormRadio.php b/library/ZendAfi/View/Helper/FormRadio.php index 1fc43ac980abdc670a1d247e983c52dcfd44badd..ce21c367e19fe00daf3e2ca8f8cc2ad60bbd6997 100644 --- a/library/ZendAfi/View/Helper/FormRadio.php +++ b/library/ZendAfi/View/Helper/FormRadio.php @@ -21,10 +21,12 @@ class ZendAfi_View_Helper_FormRadio extends ZendAfi_View_Helper_FormElement { + protected $_inputType = 'radio', $_isArray = false; + public function formRadio($name, $value = null, $attribs = null, $options = null, $listsep = "<br />\n") { $info = $this->_getInfo($name, $value, $attribs, $options, $listsep); extract($info); @@ -108,7 +110,7 @@ class ZendAfi_View_Helper_FormRadio extends ZendAfi_View_Helper_FormElement { array_merge(['type' => $this->_inputType, 'name' => $name, 'id' => $optId, - 'value' => $this->view->escape($opt_value)], + 'value' => $opt_value], $input_attribs, $attribs), $label_attribs) diff --git a/library/ZendAfi/View/Helper/TagCredits.php b/library/ZendAfi/View/Helper/TagCredits.php index 48a206913790b13f581f3cc3a7882cb207495bff..97cf79c6876b8d0840657dacb27bcbdbe8b3bdc0 100644 --- a/library/ZendAfi/View/Helper/TagCredits.php +++ b/library/ZendAfi/View/Helper/TagCredits.php @@ -24,7 +24,7 @@ class ZendAfi_View_Helper_TagCredits extends Zend_View_Helper_HtmlElement { return sprintf('© 2006-%d - %s <a href="%s" target="_blank" title="%s">Bokeh</a>', date("Y"), $this->view->_('Propulsé par'), - 'http://www.bokeh-library-portal.org', + 'https://www.bokeh-library-portal.org', $this->view->_('Site communautaire du projet Bokeh')); } } diff --git a/library/digital_resources/Assimil/Config.php b/library/digital_resources/Assimil/Config.php index 58f5ac49a373de1385769bd2026390a17c4fbd6d..82380ca0df5dcea98ef5744f84c25f65123f0fec 100644 --- a/library/digital_resources/Assimil/Config.php +++ b/library/digital_resources/Assimil/Config.php @@ -30,7 +30,7 @@ class Assimil_Config extends Class_DigitalResource_Config { 'HelpLink' => 'http://wiki.bokeh-library-portal.org/index.php/ASSIMIL', 'Url' => 'http://fr.assimil.com/', - 'Icon' => 'http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/assimil.png', + 'Icon' => 'https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/assimil.png', 'Mail' => 'contact@assimil.com', 'MailUrl' => 'http://fr.assimil.con/contact', diff --git a/library/digital_resources/Lekiosk/Config.php b/library/digital_resources/Lekiosk/Config.php index f7b40600424767d5a442d59bcab6b5f5e57cc774..809a071d5564da43e6f0700e11a78d6031b1d01c 100644 --- a/library/digital_resources/Lekiosk/Config.php +++ b/library/digital_resources/Lekiosk/Config.php @@ -31,7 +31,7 @@ class Lekiosk_Config extends Class_DigitalResource_Config { 'HelpLink' => 'http://wiki.bokeh-library-portal.org/index.php/Le_Kiosk', 'Url' => 'http://www.lekiosk.com/', - 'Icon' => 'http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/lekiosk.png', + 'Icon' => 'https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/lekiosk.png', 'MailUrl' => 'http://get.lekiosk.com/pro/?utm_source=LK&utm_campaign=B2B&utm_medium=footer', diff --git a/library/digital_resources/Orthodidacte/Config.php b/library/digital_resources/Orthodidacte/Config.php index e0e79ae1d22e4e5488aa3852a6fc871288ff1635..6256851b7107f2219b95ba97a9506847e0161591 100644 --- a/library/digital_resources/Orthodidacte/Config.php +++ b/library/digital_resources/Orthodidacte/Config.php @@ -25,7 +25,7 @@ class Orthodidacte_Config extends Class_DigitalResource_Config { return ['Introduction' => $this->_('Orthodidacte constitue une nouvelle approche pour apprendre l’orthographe et la grammaire de la langue française en ligne.'), 'HelpLink' => 'http://wiki.bokeh-library-portal.org/index.php/Orthodidacte', 'Url' => 'https://www.orthodidacte.com/', - 'Icon' => 'http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_orthodidacte_pastille.png', + 'Icon' => 'https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_orthodidacte_pastille.png', 'PermissionLabel' => $this->_('Bibliothèque numérique: accéder à la ressource Orthodidacte'), diff --git a/library/digital_resources/ToutApprendre/Config.php b/library/digital_resources/ToutApprendre/Config.php index 3d2dd4457c60fb6cbb95234f1a83974a9c20c7af..c7b4903b312bc7357d25c17f2170251263292605 100644 --- a/library/digital_resources/ToutApprendre/Config.php +++ b/library/digital_resources/ToutApprendre/Config.php @@ -28,7 +28,7 @@ class ToutApprendre_Config extends Class_DigitalResource_Config { 'Url' => 'https://www.toutapprendre.com/', - 'Icon' => 'http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/toutapprendre.png', + 'Icon' => 'https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/toutapprendre.png', 'PermissionLabel' => $this->_('Bibliothèque numérique: accéder à la ressource ToutApprendre'), 'NotAllowedMessage' => $this->_('Votre compte n\'est pas autorisé à accéder à cette ressource.'), diff --git a/library/fonctions/string.php b/library/fonctions/string.php index f2ffa875461525f003d21b66b7dddc1f08ac59b4..a3718d868e46f70d9298c12eda9789eb3043dc61 100644 --- a/library/fonctions/string.php +++ b/library/fonctions/string.php @@ -23,7 +23,7 @@ * ne pas supprimer à moins de faire le tour de toutes les skins */ function getVar($cle) { - return Class_AdminVar::get($clef); + return Class_AdminVar::get($cle); } diff --git a/public/opac/js/digital_connectors.js b/public/opac/js/digital_connectors.js index f6a0e465ae0783a5f723cc1a5f1eb53d976a572a..09706d50ec703ebcba8bb76392a769c89e9faa7f 100644 --- a/public/opac/js/digital_connectors.js +++ b/public/opac/js/digital_connectors.js @@ -3,7 +3,7 @@ "label" : "Cité de la musique", "enabled": "isCiteDeLaMusiqueEnabled", "url" : "http://media.citedelamusique.fr", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/cite_de_la_musique.png", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/cite_de_la_musique.png", "desc": "L'offre Média de la Cité de la musique en intégralité.", "features": ["HARVEST", "SSO"], "sales_contact": {"mail" : "yadelbost@media.citedelamusique.fr", @@ -14,7 +14,7 @@ "label" : "Jamendo Music", "enabled": "isJamendoEnabled", "url" : "https://www.jamendo.com", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/jamendo_logo_200.png", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/jamendo_logo_200.png", "desc": "Jamendo Music est un des plus grands services en ligne dédiée à la musique indépendante, fort d’une large communauté internationale de musiciens et de mélomanes.<br/>Grâce à Jamendo, n’importe qui peut profiter librement d’un catalogue de 500 000 titres mis en ligne par plus de 30 000 artistes venant du monde entier.", "features": ["HARVEST"], "sales_contact": {"mail" : "", @@ -25,7 +25,7 @@ "label" : "SoundCloud", "enabled": "isSoundCloudEnabled", "url" : "https://www.soundcloud.com", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/soundcloud_200.png", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/soundcloud_200.png", "desc": "SoundCloud est une plateforme de distribution audio en ligne sur laquelle les utilisateurs peuvent collaborer, promouvoir et distribuer leurs projets musicaux.", "features": ["HARVEST"], "sales_contact": {"mail" : "", @@ -36,7 +36,7 @@ "label" : "ArteVOD", "enabled": "isArteVODEnabled", "url" : "http://www.mediatheque-numerique.com/", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/arte_vod.png", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/arte_vod.png", "desc": "Le meilleur du catalogue d'ARTE (grands documentaires, collections emblématiques, spectacles, émissions phares, cinéma patrimonial et contemporain)", "features": ["HARVEST", "SSO"], "sales_contact": {"mail": "contact@mediatheque-numerique.com", @@ -47,7 +47,7 @@ "label" : "Babelthèque", "enabled": "getBabelthequeId", "url" : "http://www.babelio.com", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/babeltheque.jpg", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/babeltheque.jpg", "desc": "Babelthèque permet aux bibliothèques d’enrichir leurs OPAC et leurs sites Internet en important le contenu produit par les membres de la communauté de lecteurs Babelio.com : critiques, citations, nuages d’étiquettes etc...", "features": ["EMBEDED"], "sales_contact": {"mail" : "babeltheque@babelio.com", @@ -58,7 +58,7 @@ "label" : "Bibliovox", "enabled": "isCyberlibrisEnabled", "url" : "http://www.bibliovox.com/", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/bibliovox.jpg", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/bibliovox.jpg", "desc": "La plateforme de livres numériques des bibliothèques municipales et départementales", "features": ["HARVEST", "SSO"], "sales_contact": {"mail" : "jean-pierre.d@cyberlibris.com", @@ -69,7 +69,7 @@ "label" : "Europresse", "enabled": "PROVIDER", "url" : "http://www.europresse.com/", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/europresse.png", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/europresse.png", "desc": "Solution en ligne d'information de presse conçue pour les bibliothèques publiques et le domaine de l'éducation. Elle offre un accès illimité à une importante banque de sources d'information canadiennes et européennes.", "features": [], "sales_contact": {"mail" : "", @@ -80,7 +80,7 @@ "label" : "Kidilangue", "enabled": "isKidilanguesEnabled", "url" : "http://www.kidilangues.fr/", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/kidilangues.jpg", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/kidilangues.jpg", "desc": "Kidilangues propose plus de 100 activités en français et dans plusieurs langues pour les 3 à 10 ans. Ils naviguent dans un espace sécurisé en toute autonomie.", "features": ["SSO"], "sales_contact": {"mail" : "contact@kidilangues.fr", @@ -91,7 +91,7 @@ "label" : "Lectura", "enabled": "isLecturaEnabled", "url" : "http://www.lectura.fr/", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/lectura.png", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/lectura.png", "desc": "Le portail des bibliothèques des villes-centres de Rhône-Alpes.", "features": ["SSO"], "sales_contact": {"mail" : "", @@ -102,7 +102,7 @@ "label" : "MyCoW", "enabled": "isMyCowEnabled", "url" : "http://www.mycow.eu/", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/mycow.jpg", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/mycow.jpg", "desc": "MyCOW est un service en ligne proposant d'apprendre et de pratiquer l'anglais.", "features": ["SSO"], "sales_contact": {"mail" : "", @@ -113,7 +113,7 @@ "label" : "Naxos Music Library", "enabled": "PROVIDER", "url" : "http://www.naxos.com/naxos/countries/France/disco_naxos.asp", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/naxos.jpg", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/naxos.jpg", "desc": "La Discothèque Naxos est une discothèque numérique en ligne, qui regroupe plus de 10 000 disques de musique classique, mais aussi de jazz, blues, world, folk, etc. <br/><br/>En plus de l’écoute de la musique, les abonnées de la Discothèque Naxos ont accès à des ressources documentaires exceptionnelles sur les compositeurs, les interprètes, les Å“uvres, etc.", "features": [], "sales_contact": {"mail" : "", @@ -124,7 +124,7 @@ "label" : "Numérique premium", "enabled": "isNumeriquePremiumEnabled", "url" : "http://www.numeriquepremium.com", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/numeriquepremium.jpg", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/numeriquepremium.jpg", "desc": "NUMERIQUE PREMIUM est une plateforme proposant des ebooks en Histoire et Sciences Humaines.<br/><br/>Plus de 1500 ouvrages en français, en partenariat avec une trentaine d'éditeurs, à consulter et lire 24h/24 et 7j/7 depuis votre bibliothèque et à distance.", "features": ["HARVEST", "SSO"], "sales_contact": {"mail" : "info@numeriquepremium.com", @@ -135,7 +135,7 @@ "label" : "Numilog", "enabled": "isNumilogEnabled", "url" : "http://www.numilog.fr", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/numilog.png", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/numilog.png", "desc": "Numilog est un distributeur et diffuseur français de livres numériques.", "features": ["HARVEST", "SSO"], "sales_contact": {"mail" : "contact@numilog.com", @@ -146,7 +146,7 @@ "label" : "PlanetNemo", "enabled": "isPlanetNemoEnabled", "url" : "http://www.planetnemo.com", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/planetnemo.png", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/planetnemo.png", "desc": "Plateforme ludo-éducatif pour les enfants de 3 à 8 ans. En quelques clics, les enfants ont accès à plus de 200 jeux et activités ludo-éducatives en accès illimité, répartis en plus de 7 univers interactifs et enrichissants.", "features": ["SSO"], "sales_contact": {"mail" : "", @@ -168,7 +168,7 @@ "label" : "Vodeclic", "enabled": "isVodeclicEnabled", "url" : "http://www.vodeclic.com", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/vodeclic.png", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/vodeclic.png", "desc": "Vodeclic est une solution de formation pour développer ses compétences bureautiques.", "features": ["HARVEST", "SSO"], "sales_contact": {"mail" : "", @@ -211,7 +211,7 @@ "label" : "Médiapart", "enabled": "PROVIDER", "url" : "https://www.mediapart.fr", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_mediapart.png", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_mediapart.png", "desc": "Mediapart est un journal d'information numérique, indépendant et participatif.", "features": [], "sales_contact": {"mail" : "", @@ -223,7 +223,7 @@ "label" : "Universalis", "enabled": "PROVIDER", "url" : "http://www.universalis-edu.com/", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_universalis.jpg", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_universalis.jpg", "desc": "Encyclopédie francophone proposant des contenus couvrant tous les domaines de la connaissance illustrés par de nombreux médias.", "features": [], "sales_contact": {"mail" : "", @@ -236,7 +236,7 @@ "label" : "Références par Indexpresse", "enabled": "PROVIDER", "url" : "http://www.references-indexpresse.com", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_references.png", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_references.png", "desc": "Références est le moteur de recherche dédié aux revues et magazines français « grand public ».", "features": [], "sales_contact": {"mail" : "", @@ -249,7 +249,7 @@ "label" : "Sciences en ligne", "enabled": "PROVIDER", "url" : "http://www.sciences-en-ligne.com", - "image_url" : "http://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_sciencesenligne.png", + "image_url" : "https://bokeh-library-portal.org/userfiles/media/ressources_numeriques/logo_sciencesenligne.png", "desc": "Ressources encyclopédique scientifique et technique, en français.", "features": [], "sales_contact": {"mail" : "", diff --git a/tests/application/modules/admin/controllers/ActivityControllerTest.php b/tests/application/modules/admin/controllers/ActivityControllerTest.php index b962d0618fe83c37339eadd8a565e636cd14d9b9..708050e009e398f5badedb5575dd7f0082b7ce60 100644 --- a/tests/application/modules/admin/controllers/ActivityControllerTest.php +++ b/tests/application/modules/admin/controllers/ActivityControllerTest.php @@ -682,10 +682,23 @@ class Admin_ActivityControllerEditSessionLearningJavaFevrierTest extends Admin_ $this->assertXPath('//select[@name="field_5"]'); } + /** @test */ function panelActivityLearnJavaShouldBeVisible() { $this->assertXPathContentContains('//ul//li', 'Learn Java', $this->_response->getBody()); } + + + /** @test */ + public function linkToEditActivityLearnJavaShouldBePresent() { + $this->assertXPath('//a[contains(@href, "/admin/activity/edit/id/3")]'); + } + + + /** @test */ + public function linkToHideActivityLearnJavaShouldBePresent() { + $this->assertXPath('//a[contains(@href, "/admin/activity/hide/id/3")]'); + } } diff --git a/tests/application/modules/admin/controllers/CmsControllerCustomFieldsTest.php b/tests/application/modules/admin/controllers/CmsControllerCustomFieldsTest.php index de9e0bcb4b9b6d995d496c3d85c7716fa07f0cfa..25bb72addc3d24dd905f36c9770561607d5d5733 100644 --- a/tests/application/modules/admin/controllers/CmsControllerCustomFieldsTest.php +++ b/tests/application/modules/admin/controllers/CmsControllerCustomFieldsTest.php @@ -36,16 +36,10 @@ abstract class CmsControllerCustomFieldsTestCase extends AbstractControllerTestC 'code' => Class_CodifThesaurus::fixedCodeOf('CustomField'), 'libelle' => 'Champs personnalisés']); - $meta = $this->fixture('Class_CustomField_Meta', - ['id' => 3, - 'label' => 'Public', - 'field_type' => Class_CustomField_Meta::SELECT, - 'options_list' => 'Hardcore gamers; newbies', - 'indexable' => 1]); $closure = function () { $this->_count++; if ($this->_count == 1) return []; - return array_filter( [Class_CodifThesaurus::findFirstBy(['libelle' => 'Hardcore gamers']),Class_CodifThesaurus::findFirstBy(['libelle' => 'newbies'])]);} ; + return array_filter( [Class_CodifThesaurus::findFirstBy(['libelle' => 'Hardcore gamers']),Class_CodifThesaurus::findFirstBy(['libelle' => 'Newbies'])]);} ; Storm_Test_ObjectWrapper::onLoaderOfModel('Class_CodifThesaurus') ->whenCalled('findAllBy') @@ -53,7 +47,12 @@ abstract class CmsControllerCustomFieldsTestCase extends AbstractControllerTestC 'order' => 'libelle']) ->willDo($closure); - + $meta = $this->fixture('Class_CustomField_Meta', + ['id' => 3, + 'label' => 'Public', + 'field_type' => Class_CustomField_Meta::SELECT, + 'options_list' => 'Hardcore gamers; Newbies;', + 'indexable' => 1]); $this->_custom_field = $this->fixture('Class_CustomField', ['id' => 5, @@ -61,11 +60,23 @@ abstract class CmsControllerCustomFieldsTestCase extends AbstractControllerTestC 'meta' => $meta, 'model' => 'Article']); + $meta_multi = $this->fixture('Class_CustomField_Meta', + ['id' => 8, + 'label' => 'Niveau d\'accès', + 'field_type' => Class_CustomField_Meta::MULTI_CHECKBOX, + 'options_list' => 'Débutant; Expert;', + 'indexable' => 0]); + + $this->fixture('Class_CustomField', + ['id' => 89, + 'priority' => 9, + 'meta' => $meta_multi, + 'model' => 'Article']); + $this->_article = $this->fixture('Class_Article', ['id' => 1, 'titre' => 'News Article', 'contenu' => 'Welcome']); - } } @@ -87,7 +98,7 @@ class CmsControllerCustomFieldsEditActionTest extends CmsControllerCustomFieldsT /** @test */ public function publicNewsbiesShouldBePresent() { - $this->assertXPathContentContains('//select[@name="field_5"]//option', 'newbies'); + $this->assertXPathContentContains('//select[@name="field_5"]//option', 'Newbies'); } } @@ -101,7 +112,7 @@ class CmsControllerCustomFieldsWithNewbiesSetActionTest extends CmsControllerCus ['id' => 10, 'model_id' => 1, 'custom_field_id' => 5, - 'value' => 'newbies']); + 'value' => 'Newbies']); } @@ -109,7 +120,7 @@ class CmsControllerCustomFieldsWithNewbiesSetActionTest extends CmsControllerCus public function editActionShouldHaveNewbiesOptionSelected() { $this->dispatch('admin/cms/edit/id/1' ,true); $this->assertXPathContentContains('//select[@name="field_5"]//option[@selected="selected"]', - 'newbies'); + 'Newbies'); } @@ -140,6 +151,7 @@ class CmsControllerCustomFieldsAndIndexationPostEditActionTest 'indexation' => 1, 'status' => Class_Article::STATUS_VALIDATED, 'field_5' => 'Hardcore gamers', + 'field_89' => ['Débutant'], 'debut' => '', 'fin' => '', 'events_debut' => '', @@ -153,11 +165,17 @@ class CmsControllerCustomFieldsAndIndexationPostEditActionTest /** @test */ - public function shouldHaveCreatedCustomValue() { + public function shouldHaveCreatedCustomValueHardcoreGamers() { $this->assertNotNull(Class_CustomField_Value::findFirstBy(['value' => 'Hardcore gamers'])); } + /** @test */ + public function shouldHaveCreatedCustomValueDebutant() { + $this->assertNotNull(Class_CustomField_Value::findFirstBy(['value' => 'Débutant'])); + } + + /** @test */ public function shouldHaveCreatedCustomFieldThesaurus() { $this->assertNotNull($this->_field_thesaurus); @@ -240,7 +258,7 @@ class CmsControllerCustomFieldsNotIndexableMetaPostEditActionTest function() { Class_CodifThesaurus::findForCustomField($this->_custom_field)->delete(); Class_CodifThesaurus::findFirstBy(['libelle' => 'Hardcore gamers'])->delete(); - Class_CodifThesaurus::findFirstBy(['libelle' => 'newbies'])->delete(); + Class_CodifThesaurus::findFirstBy(['libelle' => 'Newbies'])->delete(); }) ->beStrict()); diff --git a/tests/application/modules/admin/controllers/IndexControllerTest.php b/tests/application/modules/admin/controllers/IndexControllerTest.php index 7c6174595a53ad1673b9d864c6767ed00784518f..5ec3832afc5018152934563ff01aad82df544b69 100644 --- a/tests/application/modules/admin/controllers/IndexControllerTest.php +++ b/tests/application/modules/admin/controllers/IndexControllerTest.php @@ -48,7 +48,7 @@ class Admin_IndexControllerTest extends Admin_IndexControllerTestCase { $this->fixture('Class_AdminVar', ['id' => 'NOM_DOMAINE', 'clef' => 'NOM_DOMAINE', - 'valeur' => 'http://bokeh-library-portal.org']); + 'valeur' => 'https://bokeh-library-portal.org']); $this->dispatch('/admin/index/index', true); } diff --git a/tests/application/modules/admin/controllers/NewsletterControllerTest.php b/tests/application/modules/admin/controllers/NewsletterControllerTest.php index 88a47098fedfc4236162ce123216eab52e5abaa4..dbba602a517cad528b917dd0c57f95fe81f02e33 100644 --- a/tests/application/modules/admin/controllers/NewsletterControllerTest.php +++ b/tests/application/modules/admin/controllers/NewsletterControllerTest.php @@ -879,6 +879,11 @@ class Admin_NewsletterControllerPreviewActionTest extends Admin_NewsletterContro 'titre' => 'L\'arnaque', 'contenu' => 'La révolution a oublié de décapiter la misère et l\'exploitation.']); + $l_arnaque = $this->fixture('Class_Article', + ['id' => 13, + 'titre' => 'Gilets Jaunes', + 'contenu' => 'La révolution a commencé.']); + $this->fixture('Class_ArticleCategorie', ['id' => 89, 'libelle' => 'La France', @@ -892,8 +897,8 @@ class Admin_NewsletterControllerPreviewActionTest extends Admin_NewsletterContro 'id_catalogue' => 1, 'nb_notices' => 0, 'id_panier' => null, - 'articles_categories_ids' => '89-99', - 'articles_ids' => '12', + 'articles_categories_ids' => '99-89', + 'articles_ids' => '12-13', 'last_distribution_date' => '2012-03-02']); @@ -945,13 +950,26 @@ class Admin_NewsletterControllerPreviewActionTest extends Admin_NewsletterContro /** @test */ public function leRoiDesConsShouldBeDisplay() { - $this->assertXpath('//div', 'Le Roi des cons', $this->_response->getBody()); + $this->assertXPathContentContains('//div', 'Le Roi des cons', $this->_response->getBody()); } /** @test */ public function lArnaqueShouldBeDisplay() { - $this->assertXpath('//div', 'L\'arnaque', $this->_response->getBody()); + $this->assertXPathContentContains('//div', 'L\'arnaque', $this->_response->getBody()); + } + + + /** @test */ + public function GiletsJaunesShouldBeDisplay() { + $this->assertXPathContentContains('//div', 'Gilets Jaunes', $this->_response->getBody()); + + } + + + /** @test */ + public function septanteMillionsShouldBeDisplay() { + $this->assertXPathContentContains('//div', '70 millions', $this->_response->getBody()); } } diff --git a/tests/application/modules/opac/controllers/BibNumeriqueControllerTest.php b/tests/application/modules/opac/controllers/BibNumeriqueControllerTest.php index b44e367bc94082b471e894a0078da30a64d1dd05..694b677027856f814d4aac81a104037df47406f8 100644 --- a/tests/application/modules/opac/controllers/BibNumeriqueControllerTest.php +++ b/tests/application/modules/opac/controllers/BibNumeriqueControllerTest.php @@ -1049,7 +1049,7 @@ abstract class BibNumeriqueControllerWithAlbumCategoriesTestCase extends Abstrac 'ressources' => [$this->fixture('Class_AlbumRessource', ['id' => 32, 'titre' => 'Coursera', - 'url' => 'http://bokeh-library-portal.org/'])]]); + 'url' => 'https://bokeh-library-portal.org/'])]]); @@ -1063,7 +1063,7 @@ abstract class BibNumeriqueControllerWithAlbumCategoriesTestCase extends Abstrac 'ressources' => [$this->fixture('Class_AlbumRessource', ['id' => 3, 'titre' => 'Bokeh', - 'url' => 'http://bokeh-library-portal.org/']), + 'url' => 'https://bokeh-library-portal.org/']), $this->fixture('Class_AlbumRessource', ['id' => 42, diff --git a/tests/library/Class/AdminVarTest.php b/tests/library/Class/AdminVarTest.php index e8c96d6b8b0359dd21b45d3d80cd3a501c98c259..71e8f96260d2dd3a672efedafeab1a80664c9bc9 100644 --- a/tests/library/Class/AdminVarTest.php +++ b/tests/library/Class/AdminVarTest.php @@ -168,4 +168,12 @@ class AdminVarWorkflowTest extends ModelTestCase { } } -?> \ No newline at end of file + + +class AdminVarFromGetVarTest extends ModelTestCase { + /** @test */ + public function jsStatShouldBeRender() { + Class_AdminVar::set('JS_STAT', 'Hello script !'); + $this->assertEquals('Hello script !', getVar('JS_STAT')); + } +} \ No newline at end of file diff --git a/tests/library/Class/WebService/SIGB/VSmartFixtures.php b/tests/library/Class/WebService/SIGB/VSmartFixtures.php index d9a208a7cd49a7450a29a4f74b0d25ae6755a47c..25022f4098343a9407e6362c5c80d749fe621507 100644 --- a/tests/library/Class/WebService/SIGB/VSmartFixtures.php +++ b/tests/library/Class/WebService/SIGB/VSmartFixtures.php @@ -243,7 +243,6 @@ class VSmartFixtures { } - public static function xmlNoticeHarryPotter() { return '<zs:searchRetrieveResponse xmlns:zs="http://www.loc.gov/zing/srw/"> @@ -568,4 +567,87 @@ class VSmartFixtures { </VubisSmart>'; } -} \ No newline at end of file + + + public function xmlNoticeGruffalo() { + return + '<zs:searchRetrieveResponse xmlns:zs="http://www.loc.gov/zing/srw/"><zs:version>2014.11.14</zs:version><zs:numberOfRecords>1</zs:numberOfRecords><zs:resultSetId></zs:resultSetId><zs:records><zs:record format="UniMarc/B" type="Bibliographic"><zs:recordSchema>info:marcXchange</zs:recordSchema><zs:recordPacking>xml</zs:recordPacking><zs:recordData><leader>01339cam 2200313 450 </leader> + <controlfield tag="001">1/298782</controlfield> + <controlfield tag="003">http://catalogue.bnf.fr/ark:/12148/cb436037299</controlfield> + <controlfield tag="005">20160415153506.0</controlfield> + <datafield tag="010" ind1=" " ind2=" "><subfield code="a">978-2-07-065258-7</subfield> + <subfield code="b">rel.</subfield> + <subfield code="d">6,90 EUR</subfield> + </datafield> + <datafield tag="020" ind1=" " ind2=" "><subfield code="a">FR</subfield> + <subfield code="b">01340143</subfield> + </datafield> + <datafield tag="035" ind1=" " ind2=" "><subfield code="a">FRBNF436037290000006</subfield> + </datafield> + <datafield tag="073" ind1=" " ind2="0"><subfield code="a">9782070652587</subfield> + </datafield> + <datafield tag="100" ind1=" " ind2=" "><subfield code="a">20130603d2013 a y0frey50 ba</subfield> + </datafield> + <datafield tag="101" ind1="1" ind2=" "><subfield code="a">fre</subfield> + <subfield code="c">eng</subfield> + </datafield> + <datafield tag="102" ind1=" " ind2=" "><subfield code="a">FR</subfield> + </datafield> + <datafield tag="105" ind1=" " ind2=" "><subfield code="a">||||z 00|y|</subfield> + </datafield> + <datafield tag="106" ind1=" " ind2=" "><subfield code="a">r</subfield> + </datafield> + <datafield tag="200" ind1="1" ind2=" "><subfield code="a">Que font les animaux ?</subfield> + <subfield code="b">texte imprimé</subfield> + <subfield code="f">Julia Donaldson</subfield> + <subfield code="g">[illustré par] Axel Scheffler</subfield> + </datafield> + <datafield tag="210" ind1=" " ind2=" "><subfield code="a">[Paris]</subfield> + <subfield code="c">Gallimard jeunesse</subfield> + <subfield code="d">DL 2013</subfield> + <subfield code="e">impr. en Chine</subfield> + </datafield> + <datafield tag="215" ind1=" " ind2=" "><subfield code="a">1 vol. (non paginé [12] p.)</subfield> + <subfield code="c">ill. en coul., couv. ill. en coul.</subfield> + <subfield code="d">21 cm</subfield> + </datafield> + <datafield tag="225" ind1="1" ind2="9"><subfield code="a">Mon 1er Gruffalo</subfield> + </datafield> + <datafield tag="316" ind1=" " ind2=" "><subfield code="5">FR-751131010:43603729002001</subfield> + </datafield> + <datafield tag="454" ind1=" " ind2="1"><subfield code="t">Animal actions</subfield> + </datafield> + <datafield tag="461" ind1=" " ind2="0"><subfield code="0">43637007</subfield> + <subfield code="t">Mon 1er Gruffalo</subfield> + </datafield> + <datafield tag="700" ind1=" " ind2="1"><subfield code="1">13344359</subfield> + <subfield code="a">Donaldson</subfield> + <subfield code="b">Julia</subfield> + <subfield code="f">1948-....</subfield> + <subfield code="4">070</subfield> + </datafield> + <datafield tag="702" ind1=" " ind2="1"><subfield code="1">12181290</subfield> + <subfield code="a">Scheffler</subfield> + <subfield code="b">Axel</subfield> + <subfield code="f">1957-....</subfield> + <subfield code="4">440</subfield> + </datafield> + <datafield tag="801" ind1=" " ind2="0"><subfield code="a">FR</subfield> + <subfield code="b">FR-751131015</subfield> + <subfield code="c">20130603</subfield> + <subfield code="g">AFNOR</subfield> + </datafield> + <datafield tag="852"><subfield code="a">RES</subfield> + <subfield code="b">MCFC</subfield> + <subfield code="c">MCPE</subfield> + <subfield code="e">20160415</subfield> + <subfield code="h">AC DON</subfield> + <subfield code="p">MC0047471</subfield> + <subfield code="q">MC0047471</subfield> + <subfield code="t">LFJ</subfield> + <subfield code="u">Non</subfield> + <subfield code="y">66</subfield> + </datafield> + </zs:recordData><zs:recordPosition>-1</zs:recordPosition></zs:record></zs:records></zs:searchRetrieveResponse>'; + } +} diff --git a/tests/library/Class/WebService/SIGB/VSmartTest.php b/tests/library/Class/WebService/SIGB/VSmartTest.php index 5226dda4e0d8060991c73967ec4ee23b023e7e1e..4000fc706df3a3c561371fafa9271f94851a2857 100644 --- a/tests/library/Class/WebService/SIGB/VSmartTest.php +++ b/tests/library/Class/WebService/SIGB/VSmartTest.php @@ -950,4 +950,30 @@ class VSmartServiceGetConsultationRequestsTest extends VSmartServiceTestCase { } } -?> \ No newline at end of file + + +class VSmartServiceBibGetMonPremierGruffaloTest extends ModelTestCase { + protected $_gruffalo; + + public function setUp() { + $mock_web_client = $this + ->mock() + ->beStrict() + + ->whenCalled('open_url') + ->with('http://86.64.58.38/formation/VubisSmartHttpApi.csp?fu=BibSearch&Application=Bib&Database=1&RequestType=RecordNumber&Request=47918') + ->answers(VSmartFixtures::xmlNoticeGruffalo()); + + $this->_gruffalo = Class_WebService_SIGB_VSmart_Service::newInstance() + ->setServerRoot('http://86.64.58.38/formation') + ->setWebClient($mock_web_client) + ->getNotice('1/47918'); + } + + + /** @test */ + public function disponibiliteShouldBeDemandeEnCours() { + $this->assertNotNull($this->_gruffalo); + $this->assertEquals('Demande en cours', $this->_gruffalo->exemplaireAt(0)->getDisponibilite()); + } +} \ No newline at end of file diff --git a/tests/library/ZendAfi/View/Helper/Accueil/BibNumeriqueTest.php b/tests/library/ZendAfi/View/Helper/Accueil/BibNumeriqueTest.php index 39b3aabc680bbfeeee8f333e4343dfafa1720f0f..16c8b16c4716e2612c432a4fe9d3786f55dab682 100644 --- a/tests/library/ZendAfi/View/Helper/Accueil/BibNumeriqueTest.php +++ b/tests/library/ZendAfi/View/Helper/Accueil/BibNumeriqueTest.php @@ -611,7 +611,7 @@ class BibNumeriquePaginatedDisplayTest extends BibNumeriqueTestCase { 'ressources' => [$this->fixture('Class_AlbumRessource', ['id' => 32, 'titre' => 'Coursera', - 'url' => 'http://bokeh-library-portal.org/'])]]); + 'url' => 'https://bokeh-library-portal.org/'])]]); @@ -625,7 +625,7 @@ class BibNumeriquePaginatedDisplayTest extends BibNumeriqueTestCase { 'ressources' => [$this->fixture('Class_AlbumRessource', ['id' => 3, 'titre' => 'Bokeh', - 'url' => 'http://bokeh-library-portal.org/']), + 'url' => 'https://bokeh-library-portal.org/']), $this->fixture('Class_AlbumRessource', ['id' => 42, @@ -693,7 +693,7 @@ class BibNumeriqueViewCollectionSitothequesTest extends BibNumeriqueTestCase { 'ressources' => [$this->fixture('Class_AlbumRessource', ['id' => 3, 'titre' => 'Bokeh', - 'url' => 'http://bokeh-library-portal.org/']), + 'url' => 'https://bokeh-library-portal.org/']), $this->fixture('Class_AlbumRessource', ['id' => 42,