From ff823f515d7dee0c7ffa4b9f27069673465a17e4 Mon Sep 17 00:00:00 2001
From: efalcy <efalcy@git-test.afi-sa.fr>
Date: Fri, 8 Feb 2013 18:06:23 +0000
Subject: [PATCH] Rss / Sitotheque : affichage des categories sous forme
arborescente
---
.gitattributes | 1 +
.../admin/controllers/CmsController.php | 74 +++--------------
.../admin/controllers/RssController.php | 17 +++-
.../admin/controllers/SitoController.php | 13 ++-
.../ZendAfi/View/Helper/ComboCategories.php | 81 +++++++++++++++++++
.../admin/controllers/AlbumControllerTest.php | 5 +-
.../admin/controllers/CmsControllerTest.php | 15 ++--
7 files changed, 124 insertions(+), 82 deletions(-)
create mode 100644 library/ZendAfi/View/Helper/ComboCategories.php
diff --git a/.gitattributes b/.gitattributes
index e7d66c097e2..5a5d2849399 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2615,6 +2615,7 @@ library/ZendAfi/View/Helper/BoitesDivision.php -text
library/ZendAfi/View/Helper/Bouton.php -text
library/ZendAfi/View/Helper/BoutonIco.php -text
library/ZendAfi/View/Helper/CkEditor.php -text
+library/ZendAfi/View/Helper/ComboCategories.php -text
library/ZendAfi/View/Helper/ComboCodification.php -text
library/ZendAfi/View/Helper/ComboNombres.php -text
library/ZendAfi/View/Helper/ComboProfils.php -text
diff --git a/application/modules/admin/controllers/CmsController.php b/application/modules/admin/controllers/CmsController.php
index e2d0defbb77..af45b5b81e0 100644
--- a/application/modules/admin/controllers/CmsController.php
+++ b/application/modules/admin/controllers/CmsController.php
@@ -177,9 +177,14 @@ class Admin_CmsController extends Zend_Controller_Action {
$this->view->article = $article;
$this->view->titre = 'Ajouter un article';
- $this->view->combo_cat = $this->_getArticleCategoryInput($category);
+ $combo_categories = new ZendAfi_View_Helper_ComboCategories();
+ $this->view->combo_cat = $combo_categories->rendComboCategories($this,$category);
$this->view->combo_lieu_options = $this->comboLieuOptions();
}
+
+ public function getRootCategories($bib) {
+ return $bib->getArticleCategories();
+ }
public function newseditAction() {
@@ -201,7 +206,9 @@ class Admin_CmsController extends Zend_Controller_Action {
}
$this->view->article = $article;
- $this->view->combo_cat = $this->_getArticleCategoryInput($article->getCategorie());
+ // $this->view->combo_cat = $this->_getArticleCategoryInput($article->getCategorie());
+ $combo_categories = new ZendAfi_View_Helper_ComboCategories();
+ $this->view->combo_cat = $combo_categories->rendComboCategories($this,$article->getCategorie());
$this->view->combo_lieu_options = $this->comboLieuOptions();
@@ -406,69 +413,6 @@ class Admin_CmsController extends Zend_Controller_Action {
}
- /**
- * @param Class_ArticleCategorie $category
- * @return string
- */
- protected function _getArticleCategoryInput($category) {
- if (Class_Users::getLoader()->isCurrentUserCanAccessAllBibs())
- $bibs = Class_Bib::getLoader()->findAllWithPortail();
- else {
- $bib = $category->getBib();
- if (0 == $bib->getId())
- $bib = $this->_bib;
- $bibs = array($bib);
- }
-
- return sprintf('<select name="id_cat" id="id_cat">%s</select>',
- $this->_getAllBibArticleCategories($bibs, $category));
- }
-
-
- protected function _getAllBibArticleCategories($bibs, $category) {
- $html = '';
-
- foreach($bibs as $bib)
- $html .= $this->_getArticleCategorySelectGroupForBib($bib, $category);
-
- return $html;
- }
-
-
- /**
- * @param Class_Bib bib
- * @return string
- */
- protected function _getArticleCategorySelectGroupForBib($bib, $category) {
- $html = sprintf('<optgroup label="%s">', $bib->getLibelle());
- $rootCategories = $bib->getArticleCategories();
- foreach ($rootCategories as $rootCategory) {
- $html .= $this->_getLeveledArticleCategoryOption($rootCategory, $category);
- }
- $html .= '</optgroup>';
- return $html;
- }
-
-
- /**
- * @param Class_ArticleCategorie $category
- * @param Class_ArticleCategorie $origin
- * @param int $level
- * @return string
- */
- protected function _getLeveledArticleCategoryOption($category, $origin, $level = 0) {
- $prefix = str_repeat(' ', $level*2);
- $html = '<option value="' . $category->getId() . '"'
- . (($category->getId() == $origin->getId()) ? ' selected="selected"' : '') . '>'
- . $prefix . $category->getLibelle() . '</option>';
-
- foreach ($category->getSousCategories() as $subCategory) {
- $html .= $this->_getLeveledArticleCategoryOption($subCategory, $origin, $level+1);
- }
-
- return $html;
- }
-
/**
* @param Class_ArticleCategorie $category
* @return string
diff --git a/application/modules/admin/controllers/RssController.php b/application/modules/admin/controllers/RssController.php
index 13f69179706..1bd573441f6 100644
--- a/application/modules/admin/controllers/RssController.php
+++ b/application/modules/admin/controllers/RssController.php
@@ -233,7 +233,8 @@ class Admin_RssController extends Zend_Controller_Action
{
$id_cat = (int)$this->_request->getParam('id', 0);
// set up an "empty" Rss
- $combo_cat = $class_rss->rendComboCategorie($this->id_bib,$id_cat);
+ $combo_categories = new ZendAfi_View_Helper_ComboCategories();
+ $combo_cat = $combo_categories->rendComboCategories($this,$id_cat);
$menu_deploy = $this->saveTreeMenu($id_cat);
$this->view->combo_cat = $combo_cat;
}
@@ -282,7 +283,8 @@ class Admin_RssController extends Zend_Controller_Action
if ( is_string($rss[0]) ){$this->_redirect('admin/error/database');}
else
{
- $combo_cat = $class_rss->rendComboCategorie($this->id_bib,$rss[0]["ID_CAT"]);
+ $combo_categories = new ZendAfi_View_Helper_ComboCategories();
+ $combo_cat = $combo_categories->rendComboCategories($this,Class_RssCategorie::findFirstBy(['ID_CAT' => $id_cat ] ));
$this->view->rss = new stdClass();
$this->view->rss->ID_CAT = $id_cat;
$this->view->rss->ID_RSS = $id_rss;
@@ -306,7 +308,9 @@ class Admin_RssController extends Zend_Controller_Action
elseif($rss[0] == null){$this->_redirect('admin/rss?z='.$this->id_zone.'&b='.$this->id_bib);}
else
{
- $combo_cat = $class_rss->rendComboCategorie($this->id_bib,$rss[0]["ID_CAT"]);
+ $combo_categories = new ZendAfi_View_Helper_ComboCategories();
+ $combo_cat = $combo_categories->rendComboCategories($this,Class_RssCategorie::findFirstBy(['ID_CAT' => $rss[0]["ID_CAT"] ] ));
+
$menu_deploy = $this->saveTreeMenu($rss[0]["ID_CAT"]);
$this->view->rss = new stdClass();
@@ -329,6 +333,13 @@ class Admin_RssController extends Zend_Controller_Action
$this->view->sess_id_site = $this->id_bib;
}
+ public function getRootCategories($bib) {
+ return Class_RssCategorie::findAllBy(['id_site' => $bib,
+ 'id_cat_mere' => 0,
+ 'order' => 'libelle']);
+
+ }
+
function rssdelAction()
{
$class_rss = new Class_Rss();
diff --git a/application/modules/admin/controllers/SitoController.php b/application/modules/admin/controllers/SitoController.php
index f21f9343b5a..2d1ff3563b1 100644
--- a/application/modules/admin/controllers/SitoController.php
+++ b/application/modules/admin/controllers/SitoController.php
@@ -308,8 +308,8 @@ class Admin_SitoController extends Zend_Controller_Action {
}
// Action
- $this->view->combo_cat = $site->rendComboCategorie($site->getIdBib(),
- $site->getIdCat());
+ $combo_categories = new ZendAfi_View_Helper_ComboCategories();
+ $this->view->combo_cat = $combo_categories->rendComboCategories($this,$site->getCategorie());
}
@@ -325,6 +325,15 @@ class Admin_SitoController extends Zend_Controller_Action {
}
+ public function getRootCategories($bib) {
+ return $categories = Class_SitothequeCategorie::findAllBy(['id_site' => $bib,
+ 'id_cat_mere' => 0,
+ 'order' => 'libelle']);
+ }
+
+
+
+
function viewsitoAction()
{
$this->view->titre = "Afficher un site";
diff --git a/library/ZendAfi/View/Helper/ComboCategories.php b/library/ZendAfi/View/Helper/ComboCategories.php
new file mode 100644
index 00000000000..b3e6ff310df
--- /dev/null
+++ b/library/ZendAfi/View/Helper/ComboCategories.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * AFI-OPAC 2.0 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).
+ *
+ * AFI-OPAC 2.0 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 AFI-OPAC 2.0; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+class ZendAfi_View_Helper_ComboCategories extends ZendAfi_View_Helper_BaseHelper {
+ protected $_class_name;
+
+ public function rendComboCategories($class_name,$category) {
+ $this->_class_name=$class_name;
+ if (Class_Users::getLoader()->isCurrentUserCanAccessAllBibs())
+ $bibs = Class_Bib::getLoader()->findAllWithPortail();
+ else {
+ $bib = $category->getBib();
+ if (0 == $bib->getId())
+ $bib = $this->_bib;
+ $bibs = array($bib);
+ }
+
+ return sprintf('<select name="id_cat" id="id_cat">%s</select>',
+ $this->_getAllBibCategories($bibs, $category)
+ );
+ }
+
+
+ protected function _getAllBibCategories($bibs, $category) {
+ $html = '';
+
+ foreach($bibs as $bib)
+ $html .= $this->_getCategorySelectGroupForBib($bib, $category);
+
+ return $html;
+ }
+
+
+ /**
+ * @param Class_Bib bib
+ * @return string
+ */
+ protected function _getCategorySelectGroupForBib($bib, $category) {
+ $html = sprintf('<optgroup label="%s">', $bib->getLibelle());
+ $rootCategories = $this->_class_name->getRootCategories($bib);
+ foreach ($rootCategories as $rootCategory) {
+ $html .= $this->_getLeveledCategoryOption($rootCategory, $category);
+ }
+ $html .= '</optgroup>';
+ return $html;
+ }
+
+
+ protected function _getLeveledCategoryOption($category, $origin, $level = 0) {
+ $prefix = str_repeat(' ', $level*2);
+ $html = '<option value="' . $category->getId() . '"'
+ . (($category->getId() == $origin->getId()) ? ' selected="selected"' : '') . '>'
+ . $prefix . $category->getLibelle() . '</option>';
+
+ foreach ($category->getSousCategories() as $subCategory) {
+ $html .= $this->_getLeveledCategoryOption($subCategory, $origin, $level+1);
+ }
+
+ return $html;
+ }
+
+
+}
\ No newline at end of file
diff --git a/tests/application/modules/admin/controllers/AlbumControllerTest.php b/tests/application/modules/admin/controllers/AlbumControllerTest.php
index 79a515dc17f..00d49b3a16b 100644
--- a/tests/application/modules/admin/controllers/AlbumControllerTest.php
+++ b/tests/application/modules/admin/controllers/AlbumControllerTest.php
@@ -358,7 +358,8 @@ class Admin_AlbumControllerAddCategorieToFavorisTest extends Admin_AlbumControll
/** @test */
public function shouldHaveValidateButton() {
- $this->assertXPath("//div[contains(@onclick,\"$('form#categorie').submit()\")]",$this->_response->getBody());
+
+ $this->assertXPath("//div[contains(@onclick,\"submit()\")]",$this->_response->getBody());
}
@@ -653,7 +654,7 @@ class Admin_AlbumControllerAddAlbumToPatrimoineTest extends Admin_AlbumControlle
/** @test */
public function shouldHaveValidateButton() {
- $this->assertXPath("//div[contains(@onclick,\"$('form#album').submit()\")]",$this->_response->getBody());
+ $this->assertXPath("//div[contains(@onclick,\".submit()\")]",$this->_response->getBody());
}
diff --git a/tests/application/modules/admin/controllers/CmsControllerTest.php b/tests/application/modules/admin/controllers/CmsControllerTest.php
index 2a5c50b5a8c..ef741de5b60 100644
--- a/tests/application/modules/admin/controllers/CmsControllerTest.php
+++ b/tests/application/modules/admin/controllers/CmsControllerTest.php
@@ -497,7 +497,7 @@ class CmsControllerArticleConcertEditActionPostTest extends CmsControllerTestCas
->getRequest()
->setMethod('POST')
->setPost($data);
- $this->dispatch('/admin/cms/newsedit/id/4');
+ $this->dispatch('/admin/cms/newsedit/id/4',true);
Class_Article::getLoader()
->newInstanceWithId(4)
@@ -577,10 +577,10 @@ class CmsControllerArticleConcertEditActionPostTest extends CmsControllerTestCas
/** @test */
function derniereModificationShouldBeNow() {
- $date = new Zend_Date();
- $this->assertXPathContentContains('//div',
- 'Dernière modification : '.$date->toString('d MMMM yyyy'),
- $this->_response->getBody());
+
+ $this->assertContains( date('Y-m-d'),
+ $this->concert->getDateMaj());
+
}
@@ -595,11 +595,6 @@ class CmsControllerArticleConcertEditActionPostTest extends CmsControllerTestCas
$this->assertEquals($this->lieu_bonlieu, $this->concert->getLieu());
}
- /** @test */
- public function comboLieuShouldHaveOptionBonlieuSelected() {
- $this->assertXPath('//select[@name="id_lieu"]//option[@selected="selected"][@label="Bonlieu"][@value="3"]');
- }
-
/** @test */
public function domainesShouldBeOnlyHistoire() {
$this->assertEquals(['10'],$this->concert->getDomaineIdsAsArray());
--
GitLab