Changeset 1391:4c5e04fe40b9 for admin

Timestamp:

08/15/13 19:30:05 (12 years ago)

Author:

Denis Jean-Christian <contact@…>

Branch:

2.5

Message:

Enhance categories combo and other fix, step 3, addresses #1424

File:

• admin/index.php (modified) (1 diff)

admin/index.php

@@ -304 +304 @@
      if ($core->auth->check('usage,contentadmin',$core->blog->id))
      {
-          $categories_combo = array(' ' => '');
+          # Getting categories
+          $categories_combo = array(__('(No cat)') => '');
           try {
                $categories = $core->blog->getCategories(array('post_type'=>'post'));
-               while ($categories->fetch()) {
-                    $categories_combo[] = new formSelectOption(
-                         str_repeat('  ',$categories->level-1).
-                         ($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title),
-                         $categories->cat_id
-                    );
+               if (!$categories->isEmpty()) {
+                    $l = $categories->level;
+                    $full_name = array($categories->cat_title);
+
+                    while ($categories->fetch()) {
+                         if ($categories->level < $l) {
+                              $full_name = array();
+                         } elseif ($categories->level == $l) {
+                              array_pop($full_name);
+                         }
+                         $full_name[] = html::escapeHTML($categories->cat_title);
+                         $categories_combo[implode(' / ',$full_name)] = $categories->cat_id;
+                         $l = $categories->level;
+                    }
                }
           } catch (Exception $e) { }
-     
+          
           echo
           '<div id="quick">'.