rex_list auf redaxo 5.16 angepasst

yakamara · Mar 19, 2024 · 2db7118 · 2db7118
1 parent 956b400
commit 2db7118
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 27 deletions.
diff --git a/plugins/email/pages/index.php b/plugins/email/pages/index.php
@@ -166,12 +166,10 @@
 echo $content;
 
 if ($show_list) {
-    $add_sql = ' ORDER BY name';
     $link = '';
-
-    $sql = "select * from $table " . $add_sql;
-
-    $list = rex_list::factory($sql);
+    $list = rex_list::factory('select * from ' . $table, defaultSort: [
+        'name' => 'asc',
+    ]);
     // $list->setCaption(rex_i18n::msg('yform_email_header_template_caption'));
     $list->addTableAttribute('summary', rex_i18n::msg('yform_email_header_template_summary'));
     $list->addTableAttribute('class', 'table-striped');

diff --git a/plugins/manager/lib/yform/manager.php b/plugins/manager/lib/yform/manager.php
@@ -1323,10 +1323,10 @@ public function getFieldPage()
                 ], false);
                 $panel_options .= '<small class="rex-panel-option-title">' . rex_i18n::msg('yform_table') . '</small> ' . $fragment->parse('core/buttons/button_group.php');
 
-                $sql = 'select id, prio, type_id, type_name, name, label from ' . rex_yform_manager_field::table() . ' where table_name="' . $table->getTableName() . '" order by prio';
-                $list = rex_list::factory($sql, 200);
-                // $list->debug = 1;
-                // $list->setColumnFormat('id', 'Id');
+                $sql = 'select id, prio, type_id, type_name, name, label from ' . rex_yform_manager_field::table() . ' where table_name="' . $table->getTableName() . '"';
+                $list = rex_list::factory($sql, defaultSort: [
+                    'prio' => 'asc',
+                ]);
 
                 $list->addTableAttribute('class', 'table-hover');
 

diff --git a/plugins/manager/pages/data_history.php b/plugins/manager/pages/data_history.php
@@ -146,23 +146,24 @@
 $sql = rex_sql::factory();
 
 $listQuery = 'SELECT
-        h.id, dataset_id,
+        h.id as hid, dataset_id,
         id as title,
         `action`, `user`, `timestamp`
     FROM ' . rex::getTable('yform_history') . ' h
     WHERE
         `table_name` = ' . $sql->escape($this->table->getTableName()) .
-    $filterWhere . '
-    GROUP BY h.id
-    ORDER BY `timestamp` DESC';
+    $filterWhere;
 
 $userQuery = 'SELECT
         distinct `user`
     FROM ' . rex::getTable('yform_history') . ' h
     WHERE
         `table_name` = ' . $sql->escape($this->table->getTableName());
 
-$list = rex_list::factory($listQuery);
+$list = rex_list::factory($listQuery, defaultSort: [
+    'hid' => 'asc',
+    'timestamp' => 'desc',
+]);
 
 $users = $sql->getArray($userQuery);
 $users = array_combine(array_column($users, 'user'), array_column($users, 'user'));

diff --git a/plugins/manager/pages/table_edit.php b/plugins/manager/pages/table_edit.php
@@ -309,9 +309,12 @@ function rex_yform_list_translate($params)
     $fragment->setVar('size', 'xs', false);
     $panel_options = $fragment->parse('core/buttons/button_group.php');
 
-    $sql = 'select id, prio, name, table_name, status, hidden, import, export, search, mass_deletion, mass_edit, history  from `' . rex_yform_manager_table::table() . '` order by prio,table_name';
+    $sql = 'select id, prio, name, table_name, status, hidden, import, export, search, mass_deletion, mass_edit, history  from `' . rex_yform_manager_table::table().'`';
 
-    $list = rex_list::factory($sql, 200);
+    $list = rex_list::factory($sql, 200, defaultSort: [
+        'prio' => 'asc',
+        'table_name' => 'asc'
+    ]);
 
     $list->addTableAttribute('class', 'table-hover');
     $list->addParam('start', rex_request('start', 'int'));

diff --git a/plugins/rest/pages/access.php b/plugins/rest/pages/access.php
@@ -133,12 +133,10 @@
 echo $content;
 
 if ($show_list) {
-    $add_sql = ' ORDER BY id desc';
     $link = '';
-
-    $sql = "select * from $table " . $add_sql;
-
-    $list = rex_list::factory($sql);
+    $list = rex_list::factory('select * from ' . $table, defaultSort: [
+        'id' => 'desc'
+    ]);
     $list->addTableAttribute('summary', rex_i18n::msg('yform_rest_token_header_summary'));
     $list->addTableAttribute('class', 'table-striped table-hover');
     $list->addTableColumnGroup([40, 40, '*', 153, 153]);

diff --git a/plugins/rest/pages/token.php b/plugins/rest/pages/token.php
@@ -160,12 +160,10 @@
 </script><?php
 
 if ($show_list) {
-    $add_sql = ' ORDER BY name';
     $link = '';
-
-    $sql = "select * from $table " . $add_sql;
-
-    $list = rex_list::factory($sql);
+    $list = rex_list::factory('select * from ' . $table, defaultSort: [
+        'name' => 'asc',
+    ]);
     $list->addTableAttribute('summary', rex_i18n::msg('yform_rest_token_header_summary'));
     $list->addTableAttribute('class', 'table-striped');
     $list->addTableColumnGroup([40, 40, '*', 153, 153]);
@@ -191,7 +189,7 @@
         $return = $maxHits;
 
         if ('none' != $list->getValue('interval')) {
-            $currentHits = \rex_yform_rest_auth_token::getCurrentIntervalAmount($list->getValue('interval'), $list->getValue('id'));
+            $currentHits = rex_yform_rest_auth_token::getCurrentIntervalAmount($list->getValue('interval'), $list->getValue('id'));
             $return = $currentHits . ' / ' . $maxHits . ' / ' . $list->getValue('interval') . '';
         }