Changeset 818

Timestamp:

Sep 10, 2024 12:05:14 AM (9 days ago)

Author:

anonymous

Message:

Update printSortSelectMenu()

Location:

trunk

Files:

• docs/examples/_config.inc.php (modified) (1 diff)
• lib/App.inc.php (modified) (1 diff)
• lib/SortOrder.inc.php (modified) (1 diff)

trunk/docs/examples/_config.inc.php

@@ -116 +116 @@
 
     // Prettify json when testing.
-    'json_options' => ENVIRONMENT === PRODUCTION ? 0 : JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES,
+    'json_options' => ENVIRONMENT === PRODUCTION ? 0 : JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE,
 ]);
 

trunk/lib/App.inc.php

@@ -234 +234 @@
 
         // Prettify json when testing.
-        'json_options' => JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES,
+        'json_options' => JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE,
     );
 

trunk/lib/SortOrder.inc.php

@@ -234 +234 @@
     *
     * @access   public
-    * @param    array   $cols   Array of column keys (printed in <option value="
">) and names (human-readable)
+    * @param    array   $cols   Array of column keys and optional sort orders (printed in <option value="
">) and names (human-readable). E.g.:
+    *                           [
+    *                               'lecture_tbl.added_datetime--ASC' => _("Added date (oldest first)"),
+    *                               'lecture_tbl.added_datetime--DESC' => _("Added date (newest first)"),
+    *                           ]
     * @return
     * @author   Quinn Comendant <quinn@strangecode.com>
     * @since    18 May 2019 15:27:21
     */
-    public function printSortSelectMenu($cols)
-    {
-        $app =& App::getInstance();
-
-        ?><select name="sort" id="sort"><?php
+    public function printSortSelectMenu($cols, $select_attributes='name="sort" id="sort"')
+    {
+        $app =& App::getInstance();
+
+        ?><select <?php echo $select_attributes; ?>><?php
         foreach ($cols as $col => $col_name) {
-            if (!isset($this->_columns[$col])) {
+            list($sort, $order) = array_pad(explode('--', $col), 2, null);
+            if (!isset($this->_columns[$sort])) {
                 $app->logMsg(sprintf('Sort select option %s is not setup via setColumn', $col), LOG_NOTICE, __FILE__, __LINE__);
             }
             printf('<option value="%s"%s>%s</option>',
                 $col,
-                ($this->sort_by == $col ? ' selected="selected"' : ''),
+                ($this->sort_by == $sort && (!isset($order) || $this->order == $order) ? ' selected="selected"' : ''),
                 strip_tags($col_name)
             );