diff --git a/VERSIONS_HOTLINE/37032 b/VERSIONS_HOTLINE/37032 new file mode 100644 index 0000000000000000000000000000000000000000..07d22b1b92e066c5206d9b908189a680a2f9f045 --- /dev/null +++ b/VERSIONS_HOTLINE/37032 @@ -0,0 +1 @@ + - ticket #37032 : Correction du lien de gestion des favoris situé sur l'icone. Ajout d'un message dans le formulaire des domaines sur la case à cocher "Peut être un favori utilisateur" indiquant la nécessité d'une intégration pour que le paramètrage fonctionne. \ No newline at end of file diff --git a/application/modules/admin/views/scripts/catalogue/form.phtml b/application/modules/admin/views/scripts/catalogue/form.phtml index 0a444f5a267653594c7fa65e3703db6c0dfa61b0..229ab42adf611cce45db0dcf09343fd7df9c3865 100644 --- a/application/modules/admin/views/scripts/catalogue/form.phtml +++ b/application/modules/admin/views/scripts/catalogue/form.phtml @@ -46,7 +46,7 @@ <td class="gauche"><?php echo $this->formCheckbox('indexer', (int)$this->catalogue->getIndexer(), null, - [1, 0]); ?></td> + [1, 0]); ?><span style="font-weight: bold; font-size: 0.9em;"><?php echo $this->traduire('Nécessite une intégration du catalogue pour être actif'); ?></span></td> </tr> </table> </fieldset> diff --git a/library/ZendAfi/View/Helper/Abonne/Abstract.php b/library/ZendAfi/View/Helper/Abonne/Abstract.php index d4c5bc5f7d493ce708123396c5b481d5d4ff4757..8e1d526e1f9d3c8474af8972cbebb1d8e337f32f 100644 --- a/library/ZendAfi/View/Helper/Abonne/Abstract.php +++ b/library/ZendAfi/View/Helper/Abonne/Abstract.php @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ abstract class ZendAfi_View_Helper_Abonne_Abstract extends ZendAfi_View_Helper_BaseHelper { - public function tagFicheAbonne($html, $icone='', $url='') { + public function tagFicheAbonne($html, $icone='', $url='', $attribs = []) { if ($icone && $url) { $html = $this->view->tagAnchor($url, $this->view->tagImg(Class_Profil::getCurrentProfil() ->getUrlImage('/abonnes/'.$icone.'.png'), ['alt' => $icone]) . $html, - ['class' => $icone]); + array_merge(['class' => $icone], $attribs)); } return '<div class="abonneFiche '.$icone.'">'.$html.'<div class="clear"></div></div>'; } diff --git a/library/ZendAfi/View/Helper/Abonne/Settings.php b/library/ZendAfi/View/Helper/Abonne/Settings.php index 7be6a79cccc86fe177d9539d89271a111727302e..114297ea61c92c511e02b749b6a388ea6cfd9345 100644 --- a/library/ZendAfi/View/Helper/Abonne/Settings.php +++ b/library/ZendAfi/View/Helper/Abonne/Settings.php @@ -32,7 +32,8 @@ class ZendAfi_View_Helper_Abonne_Settings extends ZendAfi_View_Helper_Abonne_Abs $action_url, $this->view->_('Gérer mes favoris')), 'settings', - $action_url); + $action_url, + ['data-popup' => 'true']); } } ?> \ No newline at end of file diff --git a/tests/application/modules/admin/controllers/CatalogueControllerTest.php b/tests/application/modules/admin/controllers/CatalogueControllerTest.php index 82c68019b27c225e6ceedf1e4327b15bf1c8a1fb..c00f210df2e9d4fe748640e3b23189f53a3eb025 100644 --- a/tests/application/modules/admin/controllers/CatalogueControllerTest.php +++ b/tests/application/modules/admin/controllers/CatalogueControllerTest.php @@ -268,6 +268,13 @@ class CatalogueControllerWithAdminBibAndRightTotalAccessTest extends AdminCatalo $this->dispatch('/admin/catalogue/edit/id_catalogue/300'); $this->assertXPathContentContains('//td', 'Valider'); } + + + /** @test */ + public function editCatalogueShouldAddToBookmarksCheckboxBePresent() { + $this->dispatch('/admin/catalogue/edit/id_catalogue/300'); + $this->assertXPathContentContains('//td//input[@type="checkbox"][@id="indexer"]/following-sibling::span', 'Nécessite une intégration'); + } } diff --git a/tests/application/modules/opac/controllers/AbonneControllerFicheTest.php b/tests/application/modules/opac/controllers/AbonneControllerFicheTest.php index 710ab7579075fcc705c0552440a1b820aadd11bd..a6e1bbc325c439117a9052f0e8e48c1ee4ad41bc 100644 --- a/tests/application/modules/opac/controllers/AbonneControllerFicheTest.php +++ b/tests/application/modules/opac/controllers/AbonneControllerFicheTest.php @@ -158,4 +158,15 @@ class AbonneControllerFicheAsAdminDisableSuggestTest extends AbstractAbonneContr $this->assertNotXPathContentContains('//a[contains(@href, "/abonne/suggestion-achat")]', 'Suggérer un achat'); } + + /** @test */ + public function settingsLinkShouldBePopup() { + $this->assertXPath('//div//a[2][@data-popup="true"]'); + } + + + /** @test */ + public function settingsLinkWithImageShouldBePopup() { + $this->assertXPath('//div//a[@data-popup="true"]/img[contains(@src, "abonnes/settings")]'); + } }