From 5f243b79b536f9d9bae53ac3e2b9ec47cab31305 Mon Sep 17 00:00:00 2001
From: Patrick Barroca <pbarroca@afi-sa.fr>
Date: Tue, 12 Jun 2018 11:46:45 +0200
Subject: [PATCH] dev #75882 refactoring tag renderTable
---
.../admin/views/scripts/album/dilicom.phtml | 8 ++----
.../admin/views/scripts/batch/index.phtml | 3 +-
.../scripts/external-agendas/index.phtml | 2 +-
.../admin/views/scripts/feature/index.phtml | 6 ++--
.../admin/views/scripts/modo/membreview.phtml | 2 +-
.../views/scripts/search-form/index.phtml | 2 +-
.../scripts/users/manage-double-user.phtml | 4 +--
.../opac/views/scripts/abonne/settings.phtml | 2 +-
library/Class/TableDescription.php | 28 ++++++++++++++++++-
.../Action/Helper/ArticleListViewMode.php | 6 ++--
.../ZendAfi/View/Helper/Admin/FileManager.php | 2 +-
.../View/Helper/Admin/FileManager/Models.php | 2 +-
.../ZendAfi/View/Helper/Admin/SearchUsers.php | 8 +++---
.../ZendAfi/View/Helper/Admin/Versions.php | 2 +-
.../DigitalResource/Dashboard/Rights.php | 3 +-
.../DigitalResource/Dashboard/Settings.php | 3 +-
library/ZendAfi/View/Helper/RenderTable.php | 15 ++++------
library/ZendAfi/View/Helper/TagModelTable.php | 8 ++++--
18 files changed, 61 insertions(+), 45 deletions(-)
diff --git a/application/modules/admin/views/scripts/album/dilicom.phtml b/application/modules/admin/views/scripts/album/dilicom.phtml
index ec982134db6..67f786fb33e 100644
--- a/application/modules/admin/views/scripts/album/dilicom.phtml
+++ b/application/modules/admin/views/scripts/album/dilicom.phtml
@@ -19,11 +19,9 @@ echo $this->Button((new Class_Entity())
->setImage($this->tagImg($skin->getIconUrl('actions', 'test'),
['style' => 'filter: invert();'])));
-echo $this->renderTable(new Class_TableDescription_PNBItems('pnb_dilicom'),
- $this->dilicom_items,
- ['sorter' => true,
- 'pager' => true]);
+echo $this->renderTable((new Class_TableDescription_PNBItems('pnb_dilicom'))->setPager(true),
+ $this->dilicom_items);
echo $this->tag('h2', $this->_('Import des offres Dilicom/PNB'));
-echo $this->form_import_dilicom;
\ No newline at end of file
+echo $this->form_import_dilicom;
diff --git a/application/modules/admin/views/scripts/batch/index.phtml b/application/modules/admin/views/scripts/batch/index.phtml
index 6bc95008124..5a9963dab3a 100644
--- a/application/modules/admin/views/scripts/batch/index.phtml
+++ b/application/modules/admin/views/scripts/batch/index.phtml
@@ -13,5 +13,4 @@ $description = (new Class_TableDescription('batchs'))
})
;
-echo $this->renderTable($description, $this->definitions, ['sorter' => true])
- ;
+echo $this->renderTable($description, $this->definitions);
diff --git a/application/modules/admin/views/scripts/external-agendas/index.phtml b/application/modules/admin/views/scripts/external-agendas/index.phtml
index be3fca0d36c..93e9a716379 100644
--- a/application/modules/admin/views/scripts/external-agendas/index.phtml
+++ b/application/modules/admin/views/scripts/external-agendas/index.phtml
@@ -45,4 +45,4 @@ $description = (new Class_TableDescription('agendas'))
})
->addRowAction(function($model) { return $this->renderPluginsActions($model); });
-echo $this->renderTable($description, $this->agendas, ['sorter' => true]);
+echo $this->renderTable($description, $this->agendas);
diff --git a/application/modules/admin/views/scripts/feature/index.phtml b/application/modules/admin/views/scripts/feature/index.phtml
index f8efe0789f7..eaa1d16638d 100644
--- a/application/modules/admin/views/scripts/feature/index.phtml
+++ b/application/modules/admin/views/scripts/feature/index.phtml
@@ -96,16 +96,14 @@ $description = (new Class_TableDescription('features'))
$html =
$this->tag('h2', $this->_('Nouveautés : %d' , count($this->new_features)))
. $this->tag('div', $this->renderTable($description,
- $this->new_features,
- ['sorter' => true]));
+ $this->new_features));
$description->setId('checked-features');
$html .=
$this->tag('h2', $this->_('Archivées : %d', count($this->checked_features)))
. $this->tag('div',$this->renderTable($description,
- $this->checked_features,
- ['sorter' => true]));
+ $this->checked_features));
echo $this->tag('div', $html, ['id' => 'features_list']);
diff --git a/application/modules/admin/views/scripts/modo/membreview.phtml b/application/modules/admin/views/scripts/modo/membreview.phtml
index 604d2f9ba71..b73cb6d8a10 100644
--- a/application/modules/admin/views/scripts/modo/membreview.phtml
+++ b/application/modules/admin/views/scripts/modo/membreview.phtml
@@ -24,7 +24,7 @@ $description = (new Class_TableDescription('registration'))
$this->_('Etes-vous sûr de vouloir supprimer cette demande ?'))]]]);
});
-echo $this->renderTable($description, $this->registrations, ['sorter' => true]);
+echo $this->renderTable($description, $this->registrations);
echo $this->button(
(new Class_Entity())->setText($this->_('Supprimer les demandes expirées'))
diff --git a/application/modules/admin/views/scripts/search-form/index.phtml b/application/modules/admin/views/scripts/search-form/index.phtml
index 67f871596e5..2583081c597 100644
--- a/application/modules/admin/views/scripts/search-form/index.phtml
+++ b/application/modules/admin/views/scripts/search-form/index.phtml
@@ -9,4 +9,4 @@ $description = (new Class_TableDescription('searchforms'))
->addColumn($this->_('fichier'), 'filename')
->addRowAction(function($model) { return $this->renderPluginsActions($model); });
-echo $this->renderTable($description, Class_SearchForm::findAll(), ['sorter' => true]);
+echo $this->renderTable($description, Class_SearchForm::findAll());
diff --git a/application/modules/admin/views/scripts/users/manage-double-user.phtml b/application/modules/admin/views/scripts/users/manage-double-user.phtml
index 8b9e94368b5..a3a08d8b44d 100644
--- a/application/modules/admin/views/scripts/users/manage-double-user.phtml
+++ b/application/modules/admin/views/scripts/users/manage-double-user.phtml
@@ -37,9 +37,7 @@ $description = (new Class_TableDescription('double-users'))
->setText($this->_('Conserver')));});
-echo $this->renderTable($description,
- $this->users,
- ['sorter' => true]);
+echo $this->renderTable($description, $this->users);
$attribs = [];
if ($this->previous == '')
diff --git a/application/modules/opac/views/scripts/abonne/settings.phtml b/application/modules/opac/views/scripts/abonne/settings.phtml
index dda06c3c9b4..1d06cba2c5b 100644
--- a/application/modules/opac/views/scripts/abonne/settings.phtml
+++ b/application/modules/opac/views/scripts/abonne/settings.phtml
@@ -75,7 +75,7 @@ $description = (new Class_TableDescription('bookmarked_searches'))
});
-if(!$searches = $this->renderTable($description, $this->bookmarked_searches, ['sorter' => true]))
+if(!$searches = $this->renderTable($description, $this->bookmarked_searches))
$searches = $this->_('Vous n\'avez pas enregistré de recherche dans vos favoris');
$this->openBoite($this->_('Mes recherches favorites'));
diff --git a/library/Class/TableDescription.php b/library/Class/TableDescription.php
index 50b69f6e39e..7f1cba7eed4 100644
--- a/library/Class/TableDescription.php
+++ b/library/Class/TableDescription.php
@@ -21,9 +21,13 @@
class Class_TableDescription {
+
protected
$_columns,
- $_id;
+ $_id,
+ $_pager = false,
+ $_sorter = true;
+
public function __construct($id) {
$this->_id = $id;
@@ -47,6 +51,28 @@ class Class_TableDescription {
}
+ public function setSorter($sorter) {
+ $this->_sorter = $sorter;
+ return $this;
+ }
+
+
+ public function getSorter() {
+ return $this->_sorter;
+ }
+
+
+ public function setPager($pager) {
+ $this->_pager = $pager;
+ return $this;
+ }
+
+
+ public function getPager() {
+ return $this->_pager;
+ }
+
+
public function columnsCollect($callback) {
return $this->_columns->collect($callback);
}
diff --git a/library/ZendAfi/Controller/Action/Helper/ArticleListViewMode.php b/library/ZendAfi/Controller/Action/Helper/ArticleListViewMode.php
index a22fe491946..a135e409373 100644
--- a/library/ZendAfi/Controller/Action/Helper/ArticleListViewMode.php
+++ b/library/ZendAfi/Controller/Action/Helper/ArticleListViewMode.php
@@ -62,10 +62,10 @@ class ZendAfi_Controller_Action_Helper_ArticleListViewMode extends ZendAfi_Contr
foreach($actions as $action)
$description->addRowAction($action);
+ $description->setSorter(false);
+
return $view->renderTable($description,
- (new Class_TableDescription_Models($this->getItems()))->groupBy($this->getItemsGroupBy()),
- ['sorter' => false,
- 'pager' => false]);
+ (new Class_TableDescription_Models($this->getItems()))->groupBy($this->getItemsGroupBy()));
}
diff --git a/library/ZendAfi/View/Helper/Admin/FileManager.php b/library/ZendAfi/View/Helper/Admin/FileManager.php
index 1ff62713b07..c1c5b6c8f10 100644
--- a/library/ZendAfi/View/Helper/Admin/FileManager.php
+++ b/library/ZendAfi/View/Helper/Admin/FileManager.php
@@ -385,7 +385,7 @@ class ZendAfi_View_Helper_Admin_FileManager extends ZendAfi_View_Helper_BaseHelp
->addColumn($this->_('Chemin'), ['attribute' => 'ParentPath'])
->addColumn($this->_('Modifié'), ['attribute' => 'MTime']);
- return $this->view->renderTable($description, $items, ['sorter' => true]);
+ return $this->view->renderTable($description, $items);
}
diff --git a/library/ZendAfi/View/Helper/Admin/FileManager/Models.php b/library/ZendAfi/View/Helper/Admin/FileManager/Models.php
index b7727564185..d93a34a94c3 100644
--- a/library/ZendAfi/View/Helper/Admin/FileManager/Models.php
+++ b/library/ZendAfi/View/Helper/Admin/FileManager/Models.php
@@ -34,7 +34,7 @@ class ZendAfi_View_Helper_Admin_FileManager_Models extends ZendAfi_View_Helper_B
($message ? $message : $this->_tag('p',
$this->_('Ce document est référencé dans les éléments suivants :'),
['class' => 'error'])) .
- $this->view->renderTable($description, $models, ['sorter' => true]),
+ $this->view->renderTable($description, $models),
['class' => 'path_linked_to_models']);
}
}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Admin/SearchUsers.php b/library/ZendAfi/View/Helper/Admin/SearchUsers.php
index d8a7e9a7ee4..da4eda01d3a 100644
--- a/library/ZendAfi/View/Helper/Admin/SearchUsers.php
+++ b/library/ZendAfi/View/Helper/Admin/SearchUsers.php
@@ -71,11 +71,11 @@ class ZendAfi_View_Helper_Admin_SearchUsers extends ZendAfi_View_Helper_BaseHelp
protected function _getTable() {
$description = $this
->_addColumnsTo(new Class_TableDescription('users_table'))
- ->addRowAction($this->actions);
+ ->addRowAction($this->actions)
+ ->setSorter(false);
+
return $this->view->renderTable($description,
- (new Class_TableDescription_Models($this->users)),
- ['sorter' => false,
- 'pager' => false]);
+ (new Class_TableDescription_Models($this->users)));
}
diff --git a/library/ZendAfi/View/Helper/Admin/Versions.php b/library/ZendAfi/View/Helper/Admin/Versions.php
index 74fb43c2d34..3de67c1aa8a 100644
--- a/library/ZendAfi/View/Helper/Admin/Versions.php
+++ b/library/ZendAfi/View/Helper/Admin/Versions.php
@@ -42,7 +42,7 @@ class ZendAfi_View_Helper_Admin_Versions extends ZendAfi_View_Helper_BaseHelper
})
;
- return $this->view->renderTable($description, $versions, ['sorter' => true]);
+ return $this->view->renderTable($description, $versions);
}
diff --git a/library/ZendAfi/View/Helper/DigitalResource/Dashboard/Rights.php b/library/ZendAfi/View/Helper/DigitalResource/Dashboard/Rights.php
index f706720e898..bd2199f5b82 100644
--- a/library/ZendAfi/View/Helper/DigitalResource/Dashboard/Rights.php
+++ b/library/ZendAfi/View/Helper/DigitalResource/Dashboard/Rights.php
@@ -84,8 +84,7 @@ class ZendAfi_View_Helper_DigitalResource_Dashboard_Rights extends ZendAfi_View_
});
return $this->view->renderTable($usergroup_description,
- $groups,
- ['sorter' => true]);
+ $groups);
}
}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/DigitalResource/Dashboard/Settings.php b/library/ZendAfi/View/Helper/DigitalResource/Dashboard/Settings.php
index 87ef580d3f9..bea9ea0a914 100644
--- a/library/ZendAfi/View/Helper/DigitalResource/Dashboard/Settings.php
+++ b/library/ZendAfi/View/Helper/DigitalResource/Dashboard/Settings.php
@@ -58,7 +58,6 @@ class ZendAfi_View_Helper_DigitalResource_Dashboard_Settings extends ZendAfi_Vie
});
return $this->view->renderTable($description,
- $config->getAdminVarsInstances(),
- ['sorter' => true]);
+ $config->getAdminVarsInstances());
}
}
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/RenderTable.php b/library/ZendAfi/View/Helper/RenderTable.php
index 8322e618596..c5c37a5f3b5 100644
--- a/library/ZendAfi/View/Helper/RenderTable.php
+++ b/library/ZendAfi/View/Helper/RenderTable.php
@@ -24,9 +24,8 @@ class ZendAfi_View_Helper_RenderTable extends ZendAfi_View_Helper_BaseHelper {
/**
* @param description Class_TableDescription
* @param grouped_models Class_TableDescription_Models or Array
- * @param options Array
*/
- public function renderTable($description, $grouped_models, $options = []) {
+ public function renderTable($description, $grouped_models) {
if(!$grouped_models)
return '';
@@ -40,13 +39,11 @@ class ZendAfi_View_Helper_RenderTable extends ZendAfi_View_Helper_BaseHelper {
if($grouped_models->isEmpty())
return '';
- $options = array_merge(['pager' => false], $options);
-
$classes = 'models';
- if(isset($options['sorter']) && $options['sorter']) {
+ if($description->getSorter()) {
$classes .= ' tablesorter';
- Class_ScriptLoader::getInstance()->loadTableSorter($options['pager']);
+ Class_ScriptLoader::getInstance()->loadTableSorter($description->getPager());
}
return
@@ -55,7 +52,7 @@ class ZendAfi_View_Helper_RenderTable extends ZendAfi_View_Helper_BaseHelper {
.$this->_body($description, $grouped_models),
['id' => $description->getId(),
'class' => $classes])
- . $this->_renderPager($options);
+ . $this->_renderPager($description);
}
@@ -69,8 +66,8 @@ class ZendAfi_View_Helper_RenderTable extends ZendAfi_View_Helper_BaseHelper {
}
- protected function _renderPager($options) {
- if (!$options['pager'])
+ protected function _renderPager($description) {
+ if (!$description->getPager())
return '';
$first = $this->_tag('span', '|<<' , ['class' => 'first',
diff --git a/library/ZendAfi/View/Helper/TagModelTable.php b/library/ZendAfi/View/Helper/TagModelTable.php
index 6d06b16a0ac..58281612b86 100644
--- a/library/ZendAfi/View/Helper/TagModelTable.php
+++ b/library/ZendAfi/View/Helper/TagModelTable.php
@@ -51,10 +51,12 @@ class ZendAfi_View_Helper_TagModelTable extends ZendAfi_View_Helper_BaseHelper {
foreach($actions as $action)
$description->addRowAction($action);
+ $description
+ ->setSorter($sorter)
+ ->setPager($pager);
+
return $this->view->renderTable($description,
- (new Class_TableDescription_Models($models))->groupBy($group_by),
- ['sorter' => $sorter,
- 'pager' => $pager]);
+ (new Class_TableDescription_Models($models))->groupBy($group_by));
}
}
?>
--
GitLab