diff --git a/VERSIONS_HOTLINE/135538 b/VERSIONS_HOTLINE/135538
new file mode 100644
index 0000000000000000000000000000000000000000..7480113b24de4a1defb1ae72dea6b692d4497e63
--- /dev/null
+++ b/VERSIONS_HOTLINE/135538
@@ -0,0 +1,3 @@
+ - ticket #135538 : Magasin de thèmes : Prise en charge de la configuration du menu lien vers une sélection d'articles.
+ La configuration a été harmonisée avec la configuration d'une boite d'articles.
+ Une nouvelle option page dans le rendu d'un document a été ajouté.
\ No newline at end of file
diff --git a/application/modules/opac/controllers/WidgetController.php b/application/modules/opac/controllers/WidgetController.php
index b23efb2f43d0083846344e68509d7947ad5fe9bb..6aaa0b4eec2a9965ae7f6645091d68018d695ef9 100644
--- a/application/modules/opac/controllers/WidgetController.php
+++ b/application/modules/opac/controllers/WidgetController.php
@@ -99,8 +99,8 @@ class WidgetController extends ZendAfi_Controller_Action {
: [];
$settings = array_merge(Class_Systeme_ModulesAccueil::getInstance()
- ->getModuleByCode($type_module)
- ->getDefaultValues(),
+ ->getModuleByCode($type_module)
+ ->getDefaultValues(),
$settings);
if ($widget = ((new Class_Systeme_Widget_Widget)
@@ -112,4 +112,30 @@ class WidgetController extends ZendAfi_Controller_Action {
return $this->_helper->iframe($callback);
}
+
+
+ public function renderMenuEntryAction() {
+ if (null === ($id_menu = $this->_getParam('id_menu', null)))
+ return '';
+
+ if (null === ($id_submenu = $this->_getParam('id_submenu', null)))
+ return '';
+
+ if (!$profile_id = $this->_getParam('menu_profil'))
+ return '';
+
+ Class_Template::setCurrentFrom($profile_id);
+
+ $child = new Class_Systeme_Widget_Menu;
+
+ if ($this->view->widget = $child
+ ->setId($id_submenu)
+ ->setProfileId($profile_id)
+ ->setParent($id_menu)
+ ->load())
+ return;
+
+ $this->_helper->notify($this->_('Une erreur c\'est produite. Il est impossible d\'afficher cette page'), ['status' => 'error']);
+ return $this->_redirectCloseReferer();
+ }
}
\ No newline at end of file
diff --git a/application/modules/opac/views/scripts/widget/render-menu-entry.phtml b/application/modules/opac/views/scripts/widget/render-menu-entry.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..a2a2950c3eb98304b0d64615079ff59624546033
--- /dev/null
+++ b/application/modules/opac/views/scripts/widget/render-menu-entry.phtml
@@ -0,0 +1,2 @@
+<?php
+echo Class_Template::current()->renderWidget($this->widget, $this);
diff --git a/library/Class/Systeme/ModulesAccueil/Null.php b/library/Class/Systeme/ModulesAccueil/Null.php
index aa00b872ef3efa24af39b67369d665a4ff861b55..0d49821cbd85dee56a1e8f83c62e53b71fe8e44b 100644
--- a/library/Class/Systeme/ModulesAccueil/Null.php
+++ b/library/Class/Systeme/ModulesAccueil/Null.php
@@ -35,7 +35,8 @@ class Class_Systeme_ModulesAccueil_Null {
$_isPackMobile = true,
$_defaultValues = [],
$_form,
- $_view_helper;
+ $_view_helper,
+ $_widget_context;
/** @return boolean */
@@ -214,4 +215,18 @@ class Class_Systeme_ModulesAccueil_Null {
public function getTag($params) {
return '';
}
+
+
+ public function setWidgetContext($widget_context) {
+ $this->_widget_context = $widget_context;
+ return $this;
+ }
+
+
+ public function getWidgetContext() {
+ if ( $this->_widget_context)
+ return $this->_widget_context;
+
+ return $this->_widget_context = new Intonation_Library_Widget_Carousel_NullContext;
+ }
}
\ No newline at end of file
diff --git a/library/Class/Systeme/ModulesMenu/News.php b/library/Class/Systeme/ModulesMenu/News.php
index ccb6a82d00e0cd311e57768e98342681c1b86dcf..6fe23e8661d05ffd6853d68e871bea20516eeb14 100644
--- a/library/Class/Systeme/ModulesMenu/News.php
+++ b/library/Class/Systeme/ModulesMenu/News.php
@@ -42,7 +42,7 @@ class Class_Systeme_ModulesMenu_News extends Class_Systeme_ModulesMenu_Null {
public function __construct() {
$this->_libelle = $this->_('Lien vers une sélection d\'articles');
- $this->_form = 'ZendAfi_Form_Configuration_Menu_News';
+ $this->_form = ZendAfi_Form_Configuration_Menu_News::class;
}
diff --git a/library/Class/Systeme/Widget/Abstract.php b/library/Class/Systeme/Widget/Abstract.php
index e4804d0ae6fdbe192d67e09394fcfe94dd679089..9af049561d977fef3418c4f100870bc3a09f3443 100644
--- a/library/Class/Systeme/Widget/Abstract.php
+++ b/library/Class/Systeme/Widget/Abstract.php
@@ -20,12 +20,15 @@
*/
abstract class Class_Systeme_Widget_Abstract extends Class_Entity {
+
use Trait_Translator, Trait_Versionable;
const VOLATILE_ID_PREFIX = 'no_';
protected static $_loaded_instances = [];
+ protected $_resources_defintion;
+
public static function reset() {
static::$_loaded_instances = [];
@@ -171,7 +174,11 @@ abstract class Class_Systeme_Widget_Abstract extends Class_Entity {
protected function _getWidgetResources() {
- return $this->getResourcesDefinition();
+ if ( isset($this->_resources_definition))
+ return $this->_resources_definition;
+
+ return $this->_resources_definition =
+ $this->getResourcesDefinition()->setWidgetContext($this);
}
diff --git a/library/ZendAfi/Form.php b/library/ZendAfi/Form.php
index 423bf75b05af2300a1e99d1d5c65297730f074b6..5a0adde1f9d6f052fc665122fac874caf5e7cb8b 100644
--- a/library/ZendAfi/Form.php
+++ b/library/ZendAfi/Form.php
@@ -402,4 +402,23 @@ class ZendAfi_Form extends Zend_Form {
$this->setAttrib('id', $id);
return $this;
}
+
+
+ public function removeDisplayGroupAndElements($display_group_name) {
+ if ( ! $display_group = $this->getDisplayGroup($display_group_name))
+ return $this;
+
+ $this->removesElements($display_group->getElements());
+
+ $this->removeDisplayGroup($display_group_name);
+ return $this;
+ }
+
+
+ public function removesElements($elements) {
+ foreach($elements as $element_to_delete)
+ $this->removeElement($element_to_delete->getName());
+
+ return $this;
+ }
}
diff --git a/library/templates/Intonation/Library/Menu/Articles/Definition.php b/library/templates/Intonation/Library/Menu/Articles/Definition.php
new file mode 100644
index 0000000000000000000000000000000000000000..8c52815170d9584d5c7d4e87b359e2ac2e68ed8b
--- /dev/null
+++ b/library/templates/Intonation/Library/Menu/Articles/Definition.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright (c) 2012-2021, 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 Intonation_Library_Menu_Articles_Definition extends Class_Systeme_ModulesMenu_News {
+
+ public function __construct() {
+ parent::__construct();
+ $this->_form = Intonation_Library_Menu_Articles_Form::class;
+ }
+
+
+ public function getUrl($preferences = []) {
+ $use_profil = isset($preferences['use_profil'])
+ ? $preferences['use_profil']
+ : null;
+
+ $widget_context = $this->getWidgetContext();
+
+ return Class_Url::relative(['module' => 'opac',
+ 'controller' => 'widget',
+ 'action' => 'render-menu-entry',
+ 'id_menu' => $widget_context->getParent(),
+ 'menu_profil' => $widget_context->getProfileId(),
+ 'id_submenu' => $widget_context->getId(),
+ 'id_profil' => $use_profil], null, true);
+ }
+
+
+ public function getDefaultValues() {
+ $default_widget_settings = Class_Systeme_ModulesAccueil::getInstance()
+ ->getModuleByCode($this->_type_module)
+ ->getDefaultValues();
+
+ $values = parent::getDefaultValues();
+ return $this->_defaultValues = array_merge($values,
+ $default_widget_settings,
+ ['layout' => Intonation_Library_Widget_Carousel_Definition::LISTING,
+ 'rendering' => Intonation_Library_Widget_Carousel_Definition::PAGE]);
+ }
+}
diff --git a/library/templates/Intonation/Library/Menu/Articles/Form.php b/library/templates/Intonation/Library/Menu/Articles/Form.php
new file mode 100644
index 0000000000000000000000000000000000000000..013e3ad13d577e0c3e9d007837f7e808051b2278
--- /dev/null
+++ b/library/templates/Intonation/Library/Menu/Articles/Form.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright (c) 2012-2021, 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 Intonation_Library_Menu_Articles_Form extends Intonation_Library_Widget_Carousel_Article_Form {
+
+ public function getRenderings() {
+ return array_merge(parent::getRenderings(),
+ [Intonation_Library_Widget_Carousel_Definition::PAGE => $this->_('Page')]);
+ }
+
+
+ public function init() {
+ parent::init();
+ $this
+ ->addElement('text',
+ 'libelle',
+ ['label' => $this->_('Texte du lien')])
+
+ ->addElement('IcoPicker',
+ 'picto',
+ ['label' => $this->_('Icône du lien')])
+
+ ->addElement('comboProfils',
+ 'use_profil',
+ ['label' => $this->_('Utiliser un profil particulier'),
+ 'empty_option' => true]);
+
+ }
+
+
+ public function initDisplayGroups() {
+ parent::initDisplayGroups();
+
+ $this
+ ->addToHeadGroup(['libelle', 'use_profil'])
+ ->addToStyleGroup(['picto'])
+ ->removeDisplayGroupAndElements(Class_Template::current()->withNameSpace('visibility_group'))
+ ->removeDisplayGroupAndElements(Class_Template::current()->withNameSpace('responsive_group'));
+
+ Class_Template::current()->customMenuEntryForm($this);
+ }
+}
diff --git a/library/templates/Intonation/Library/View/Wrapper/Abstract.php b/library/templates/Intonation/Library/View/Wrapper/Abstract.php
index 3feb73f8fbe3a4b482a9ee38ee9c65ebd12ddd6d..c35184c09df72e2d0800b058be8c6651d89695d2 100644
--- a/library/templates/Intonation/Library/View/Wrapper/Abstract.php
+++ b/library/templates/Intonation/Library/View/Wrapper/Abstract.php
@@ -169,6 +169,12 @@ abstract class Intonation_Library_View_Wrapper_Abstract {
}
+ /** @return string html */
+ public function asPage() {
+ return $this->_view->cardify($this);
+ }
+
+
/** @return string */
abstract public function getMainTitle();
@@ -219,5 +225,4 @@ abstract class Intonation_Library_View_Wrapper_Abstract {
/** @return Intonation_Library_OsmData */
abstract public function getOsmData();
-
}
\ No newline at end of file
diff --git a/library/templates/Intonation/Library/View/Wrapper/Article.php b/library/templates/Intonation/Library/View/Wrapper/Article.php
index 88b34994f594b2b281d41e3af48cf833584fc1f1..fd1f3e39e39dfba1b90c4e87bea267fb2630bbc4 100644
--- a/library/templates/Intonation/Library/View/Wrapper/Article.php
+++ b/library/templates/Intonation/Library/View/Wrapper/Article.php
@@ -306,4 +306,9 @@ class Intonation_Library_View_Wrapper_Article extends Intonation_Library_View_Wr
protected function _shortDate($time) {
return strftime($this->_('%d/%m/%Y'), $time);
}
+
+
+ public function asPage() {
+ return $this->_view->renderArticle($this->_model);
+ }
}
diff --git a/library/templates/Intonation/Library/Widget/Carousel/Definition.php b/library/templates/Intonation/Library/Widget/Carousel/Definition.php
index ebc478273ee36999d7a6a6053803a989328baf7e..f4e025a0a9069607a7e0afbcc3faf854ac1b741a 100644
--- a/library/templates/Intonation/Library/Widget/Carousel/Definition.php
+++ b/library/templates/Intonation/Library/Widget/Carousel/Definition.php
@@ -38,6 +38,8 @@ class Intonation_Library_Widget_Carousel_Definition extends Class_Systeme_Module
CARD_DESCRIPTION = 'card-description',
HORIZONTAL_CARD = 'card-horizontal',
CARD = 'card',
+ PAGE = 'page',
+
LIMIT_SIZE = 1000;
protected $_isPhone = false;
diff --git a/library/templates/Intonation/Library/Widget/Carousel/View.php b/library/templates/Intonation/Library/Widget/Carousel/View.php
index 88240cf439f17514c20f8318d1a9db8993805ba3..da0f765d5a553c724ef1c803d69cedf6e1a8760c 100644
--- a/library/templates/Intonation/Library/Widget/Carousel/View.php
+++ b/library/templates/Intonation/Library/Widget/Carousel/View.php
@@ -279,6 +279,12 @@ abstract class Intonation_Library_Widget_Carousel_View extends Zendafi_View_Help
return $this->view->cardifyHorizontal($element);
};
+ if ($rendering == Intonation_Library_Widget_Carousel_Definition::PAGE)
+ return function ($element)
+ {
+ return $element->asPage();
+ };
+
return function() {return '';};
}
diff --git a/library/templates/Intonation/Template.php b/library/templates/Intonation/Template.php
index 8333e0530f0f0e6e652054a4b4f6f8729fed6426..2cb5c0169a09a0791fd4280a54d3ed5ac996f94a 100644
--- a/library/templates/Intonation/Template.php
+++ b/library/templates/Intonation/Template.php
@@ -415,6 +415,7 @@ class Intonation_Template extends Class_Template {
$modules_definition['ABON_CARDS'] = Intonation_Library_Menu_AbonneCards_Definition::class;
$modules_definition['ABON_PRETS'] = Intonation_Library_Menu_AbonnePrets_Definition::class;
$modules_definition['ABON_RESAS'] = Intonation_Library_Menu_AbonneReservations_Definition::class;
+ $modules_definition['NEWS'] = Intonation_Library_Menu_Articles_Definition::class;
return $modules_definition;
}
diff --git a/tests/application/modules/AbstractControllerTestCase.php b/tests/application/modules/AbstractControllerTestCase.php
index 16f646c46626f721f94ff74e796fb67fc3267b50..9a0ff8c7cf4f4529799a36339ee8713ed55a7e7a 100644
--- a/tests/application/modules/AbstractControllerTestCase.php
+++ b/tests/application/modules/AbstractControllerTestCase.php
@@ -396,7 +396,6 @@ Error: ',
public function assertFlashMessengerContains($value, $message = '') {
- $messages = $this->_getFlashMessengerMessages();
$this->assertContains($value,
$this->_getFlashMessengerMessages(),
$message);
diff --git a/tests/scenarios/Templates/ChiliLoginTest.php b/tests/scenarios/Templates/ChiliLoginTest.php
index 6da86e34f1cc3afabfe6e9308a6d43ecbe8646a0..cb3a9c93601e8fbdeadea2c3598230f45de728c5 100644
--- a/tests/scenarios/Templates/ChiliLoginTest.php
+++ b/tests/scenarios/Templates/ChiliLoginTest.php
@@ -33,7 +33,7 @@ abstract class ChiliLoginWidgetTestCase extends Admin_AbstractControllerTestCase
'picto' => '',
'type_menu' => 'MENU',
'menus' => [0 => ['type_menu' => 'ACCUEIL',
- 'libelle' => 'Home'],
+ 'libelle' => 'Home'],
1 => ['type_menu' => 'URL',
'libelle' => 'Contact us',
@@ -53,7 +53,11 @@ abstract class ChiliLoginWidgetTestCase extends Admin_AbstractControllerTestCase
5 => ['type_menu' => 'ABON_RESAS',
'libelle' => 'My holds without tag',
- 'display_counter' => '0']
+ 'display_counter' => '0'],
+
+ 6 => ['type_menu' => 'NEWS',
+ 'libelle' => 'Latest news',
+ 'id_items' => '3']
]]);
(new Class_Template_ProfilePatcher(null))
@@ -105,6 +109,34 @@ class ChiliLoginWidgetAdminFormsTest extends ChiliLoginWidgetTestCase {
$this->dispatch('/admin/widget/edit-menu/id/4/id_profil/4/parent/0');
$this->assertXPath('//form//input[@type="checkbox"][@name="display_end_validity"][@checked]');
}
+
+
+ /** @test */
+ public function editMenuLatestNewsShouldContainsLayoutSelector() {
+ $this->dispatch('/admin/widget/edit-menu/id/6/id_profil/4/parent/0');
+ $this->assertXPath('//form//select[@name="layout"]//option[@value="list"][@selected]');
+ }
+
+
+ /** @test */
+ public function editMenuLatestNewsShouldContainsLibelle() {
+ $this->dispatch('/admin/widget/edit-menu/id/6/id_profil/4/parent/0');
+ $this->assertXPath('//form//input[@name="libelle"]');
+ }
+
+
+ /** @test */
+ public function editMenuLatestNewsShouldNotContainsVisibility() {
+ $this->dispatch('/admin/widget/edit-menu/id/6/id_profil/4/parent/0');
+ $this->assertNotXPathContentContains('//form', 'Visible à partir de');
+ }
+
+
+ /** @test */
+ public function editMenuLatestNewsShouldNotContainsResponsive() {
+ $this->dispatch('/admin/widget/edit-menu/id/6/id_profil/4/parent/0');
+ $this->assertNotXPathContentContains('//form', 'Largeur à partir de');
+ }
}
@@ -192,6 +224,12 @@ class ChiliLoginWidgetFrontTest extends ChiliLoginWidgetTestCase {
$this->assertNotXPath('//a[contains(@class, "nav-link")][contains(@href, "/abonne/cards")]//span[contains(@class, "badge_tag")]');
}
+
+
+ /** @test */
+ public function loginWidgetShouldContainsLastNewsLink() {
+ $this->assertXPathContentContains('//div[contains(@class, "dropdown-menu-right")]//a[@href="/widget/render-menu-entry/id_menu/0/menu_profil/4/id_submenu/6"]', 'Latest news');
+ }
}
@@ -211,4 +249,55 @@ class ChiliLoginNotLoggedTest extends ChiliLoginWidgetTestCase {
public function formActionShouldContainsRedircetToFirstProfile() {
$this->assertXPath('//div//form[contains(@action, "/auth/login/id_profil/4/redirect/")][contains(@action, "%2Findex%2Findex%2Fid_profil%2F1")]', $this->_response->getBody());
}
+}
+
+
+
+
+class ChiliLoginDispatchMenuArticlesTest extends ChiliLoginWidgetTestCase {
+ public function setUp() {
+ parent::setUp();
+
+ $this->fixture(Class_Article::class,
+ ['id' => 3,
+ 'titre' => 'New article',
+ 'contenu' => '<i>A new article is readeable.</i>']);
+
+ $this->dispatch('/widget/render-menu-entry/id_menu/0/menu_profil/4/id_submenu/6');
+ }
+
+
+ /** @test */
+ public function shouldRenderArticleANewArticleInAList() {
+ $this->assertXPathContentContains('//div[contains(@class, "list-group")]//div[contains(@class, "col-12")]//i', 'A new article');
+ }
+}
+
+
+
+
+class ChiliLoginDispatchMenuArticlesFailureTest extends ChiliLoginWidgetTestCase {
+ public function setUp() {
+ parent::setUp();
+
+ $this->fixture(Class_Article::class,
+ ['id' => 3,
+ 'titre' => 'New article',
+ 'contenu' => '<i>A new article is readeable.</i>']);
+
+ $this->dispatch('/widget/render-menu-entry/id_menu/3434/menu_profil/34/id_submenu/08906');
+ }
+
+
+ /** @test */
+ public function shouldRedirectToRoot() {
+ $this->assertRedirectTo('/');
+ }
+
+
+ /** @test */
+ public function shouldContainsAnErrorOccuredMessage() {
+ $this->assertFlashMessengerEquals([['notification' => ['message' => 'Une erreur c\'est produite. Il est impossible d\'afficher cette page',
+ 'status' => 'error']]]);
+ }
}
\ No newline at end of file
diff --git a/tests/scenarios/Templates/TemplatesRecordsTest.php b/tests/scenarios/Templates/TemplatesRecordsTest.php
index d4965092501f0e7d0b4e1522f932791e6cdce55b..e03c35e595c4de2519456538cc08a16eba1fa854 100644
--- a/tests/scenarios/Templates/TemplatesRecordsTest.php
+++ b/tests/scenarios/Templates/TemplatesRecordsTest.php
@@ -655,3 +655,40 @@ class TemplatesRecordsEditActionTest extends Admin_AbstractControllerTestCase {
$this->assertXPath('//input[@type="checkbox"][@name="Intonation_Library_View_Wrapper_Record_RichContent_Home"][@checked]');
}
}
+
+
+
+
+class TemplatesRecordsAsPageTest extends AbstractControllerTestCase {
+
+ protected
+ $_storm_default_to_volatile = true,
+ $_wrapper;
+
+
+ public function setUp() {
+ parent::setUp();
+ $this->_buildTemplateProfil(['id' => 7]);
+
+ $record = $this->fixture(Class_Notice::class,
+ ['id' => 12,
+ ]);
+
+ $view_renderer = new ZendAfi_Controller_Action_Helper_ViewRenderer;
+ $view_renderer->preDispatch();
+
+ $this->_wrapper = new Intonation_Library_View_Wrapper_Record($record, $view_renderer->view);
+ }
+
+
+ public function tearDown() {
+ Class_AdminVar::set('TEMPLATING', 0);
+ parent::tearDown();
+ }
+
+
+ /** @test */
+ public function recordWrapperAsPageShouldRenderACard() {
+ $this->assertContains('div class="card', $this->_wrapper->asPage());
+ }
+}