Fix filtering/ordering issues

joomlashack · Apr 4, 2019 · ddf3465 · ddf3465
1 parent 5876a3c
commit ddf3465
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 36 deletions.
diff --git a/src/admin/form/filter_sitemaps.xml b/src/admin/form/filter_sitemaps.xml
@@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
     <fields name="filter">
-        <field
-            name="search"
-            type="text"/>
+        <field name="search"
+               type="text"/>
 
-        <field
-            name="published"
-            type="status"
-            onchange="this.form.submit();"
-            filter="0,1,-2,*">
+        <field name="published"
+               type="status"
+               onchange="this.form.submit();"
+               filter="0,1,-2,*">
             <option value="">COM_OSMAP_OPTION_SELECT_PUBLISHED</option>
         </field>
 
-        <field
-            name="default"
-            type="list"
-            onchange="this.form.submit();">
+        <field name="default"
+               type="list"
+               onchange="this.form.submit();">
             <option value="">COM_OSMAP_OPTION_SELECT_DEFAULT</option>
             <option value="0">JNO</option>
             <option value="1">JYES</option>
         </field>
     </fields>
 
     <fields name="list">
-        <field
-            name="fullordering"
+        <field name="fullordering"
             type="list"
             label="COM_OSMAP_LIST_FULL_ORDERING"
             description="COM_OSMAP_LIST_FULL_ORDERING_DESC"
@@ -34,14 +30,13 @@
             <option value="">JGLOBAL_SORT_BY</option>
             <option value="sitemap.published ASC">COM_OSMAP_GRID_PUBLISHED_ASC</option>
             <option value="sitemap.published DESC">COM_OSMAP_GRID_PUBLISHED_DESC</option>
-            <option value="sitemap.default ASC">COM_OSMAP_GRID_DEFAULT_ASC</option>
-            <option value="sitemap.default DESC">COM_OSMAP_GRID_DEFAULT_DESC</option>
             <option value="sitemap.name ASC">COM_OSMAP_GRID_NAME_ASC</option>
             <option value="sitemap.name DESC">COM_OSMAP_GRID_NAME_DESC</option>
+            <option value="sitemap.id ASC">COM_OSMAP_GRID_ID_ASC</option>
+            <option value="sitemap.id DESC">COM_OSMAP_GRID_ID_DESC</option>
         </field>
 
-        <field
-            name="limit"
+        <field name="limit"
             type="limitbox"
             class="inputbox input-mini"
             default="25"

diff --git a/src/admin/language/en-GB/en-GB.com_osmap.ini b/src/admin/language/en-GB/en-GB.com_osmap.ini
@@ -24,8 +24,8 @@ COM_OSMAP_EDIT_ITEMS = "Edit Items"
 COM_OSMAP_FIELDSET_NEWS_OPTIONS = "News Sitemap"
 COM_OSMAP_FIELDSET_SITEMAP_SETTINGS_LABEL = "Sitemap Settings"
 
-COM_OSMAP_GRID_DEFAULT_ASC = "Default ascending"
-COM_OSMAP_GRID_DEFAULT_DESC = "Default descending"
+COM_OSMAP_GRID_ID_ASC = "ID ascending"
+COM_OSMAP_GRID_ID_DESC = "ID descending"
 COM_OSMAP_GRID_NAME_ASC = "Name ascending"
 COM_OSMAP_GRID_NAME_DESC = "Name descending"
 COM_OSMAP_GRID_PUBLISHED_ASC = "Published ascending"

diff --git a/src/admin/models/sitemaps.php b/src/admin/models/sitemaps.php
@@ -19,9 +19,10 @@ public function __construct($config = array())
     {
         $config['filter_fields'] = array(
             'published',
-            'sitemap.published',
             'default',
-            'sitemap.default'
+            'sitemap.published',
+            'sitemap.name',
+            'sitemap.id'
         );
 
         parent::__construct($config);
@@ -59,22 +60,22 @@ protected function getListQuery()
             $query->where('sitemap.name LIKE ' . $db->quote('%' . $search . '%'));
         }
 
-        $listOrder = $this->getState($this->context . '.list.ordering', 'sitemap.id');
-        $listDir   = $this->getState($this->context . '.list.direction', 'ASC');
-        $query->order($listOrder . ' ' . $listDir);
+        $ordering = $this->getState('list.ordering');
+        $direction   = $this->getState('list.direction');
+        $query->order($ordering . ' ' . $direction);
 
         return $query;
     }
 
-    protected function populateState($ordering = null, $direction = null)
+    protected function populateState($ordering = 'sitemap.id', $direction = 'asc')
     {
         $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published');
         $this->setState('filter.published', $published);
 
         $default = $this->getUserStateFromRequest($this->context . '.filter.default', 'filter_default');
         $this->setState('filter.default', $default);
 
-        parent::populateState('sitemap.id', 'ASC');
+        parent::populateState($ordering, $direction);
     }
 
     public function getItems()

diff --git a/src/admin/views/sitemaps/tmpl/default.php b/src/admin/views/sitemaps/tmpl/default.php
@@ -21,8 +21,8 @@
 $container = OSMap\Factory::getContainer();
 
 $baseUrl   = $container->router->sanitizeURL(JUri::root());
-$listOrder = $this->escape($this->state->get('list.ordering'));
-$listDir   = $this->escape($this->state->get('list.direction'));
+$listOrder = $this->state->get('list.ordering');
+$listDir   = $this->state->get('list.direction');
 ?>
 <form
     action="<?php echo JRoute::_('index.php?option=com_osmap&view=sitemaps'); ?>"
@@ -48,7 +48,7 @@
                     <th width="1%" style="min-width:55px" class="nowrap center">
                         <?php
                         echo JHtml::_(
-                            'grid.sort',
+                            'searchtools.sort',
                             'COM_OSMAP_HEADING_STATUS',
                             'sitemap.published',
                             $listDir,
@@ -60,7 +60,7 @@
                     <th class="title">
                         <?php
                         echo JHtml::_(
-                            'grid.sort',
+                            'searchtools.sort',
                             'COM_OSMAP_HEADING_NAME',
                             'sitemap.name',
                             $listDir,
@@ -89,7 +89,7 @@ class="<?php echo $editLinksClass; ?>">
                     <th width="1%" class="nowrap">
                         <?php
                         echo JHtml::_(
-                            'grid.sort',
+                            'searchtools.sort',
                             'COM_OSMAP_HEADING_ID',
                             'sitemap.id',
                             $listDir,
@@ -164,7 +164,5 @@ class="btn btn-micro hasTooltip"
     <?php endif; ?>
     <input type="hidden" name="task" value=""/>
     <input type="hidden" name="boxchecked" value="0"/>
-    <input type="hidden" name="filter_order" value="<?php echo $this->state->get('list.ordering'); ?>"/>
-    <input type="hidden" name="filter_order_Dir" value="<?php echo $this->state->get('list.direction'); ?>"/>
     <?php echo JHtml::_('form.token'); ?>
 </form>
diff --git a/src/admin/views/sitemaps/tmpl/modal.php b/src/admin/views/sitemaps/tmpl/modal.php
@@ -122,7 +122,5 @@
     <input type="hidden" name="layout" value="modal" />
     <input type="hidden" name="task" value="" />
     <input type="hidden" name="boxchecked" value="0" />
-    <input type="hidden" name="filter_order" value="<?php echo $this->state->get('list.ordering'); ?>" />
-    <input type="hidden" name="filter_order_Dir" value="<?php echo $this->state->get('list.direction'); ?>" />
     <?php echo JHtml::_('form.token'); ?>
 </form>