Changeset 1421:e8fea3c9a1dd

Timestamp:

08/16/13 21:40:57 (10 years ago)

Author:

Denis Jean-Christian <contact@…>

Branch:

2.5

Children:

1429:edca6a120928, 1430:3b3bd51f7a9d, 1432:49b08f56b462

Message:

Added creation of category on the fly. And under heavy pressure, revert to the other list style, fixes #1424

Location:

admin

Files:

• categories.php (modified) (1 diff)
• index.php (modified) (1 diff)
• post.php (modified) (1 diff)
• posts_actions.php (modified) (1 diff)

admin/categories.php

@@ -144 +144 @@
 if (!$rs->isEmpty())
 {
-     $l = $rs->level;
-     $full_name = array($rs->cat_title);
-
      while ($rs->fetch()) {
-          if ($rs->level < $l) {
-               $full_name = array();
-          } elseif ($rs->level == $l) {
-               array_pop($full_name);
-          }
-          $full_name[] = html::escapeHTML($rs->cat_title);
-          $categories_combo[implode(' / ',$full_name)] = $rs->cat_id;
-          $l = $rs->level;
+          $catparents_combo[] = $categories_combo[] = new formSelectOption(
+               str_repeat('&nbsp;&nbsp;',$rs->level-1).($rs->level-1 == 0 ? '' : '&bull; ').html::escapeHTML($rs->cat_title),
+               $rs->cat_id
+          );
      }
 }

admin/index.php

@@ -309 +309 @@
                $categories = $core->blog->getCategories(array('post_type'=>'post'));
                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;
+                         $catparents_combo[] = $categories_combo[] = new formSelectOption(
+                              str_repeat('&nbsp;&nbsp;',$categories->level-1).($categories->level-1 == 0 ? '' : '&bull; ').html::escapeHTML($categories->cat_title),
+                              $categories->cat_id
+                         );
                     }
                }

admin/post.php

@@ -295 +295 @@
      $categories = $core->blog->getCategories(array('post_type'=>'post'));
      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;
+               $catparents_combo[] = $categories_combo[] = new formSelectOption(
+                    str_repeat('&nbsp;&nbsp;',$categories->level-1).($categories->level-1 == 0 ? '' : '&bull; ').html::escapeHTML($categories->cat_title),
+                    $categories->cat_id
+               );
           }
      }

admin/posts_actions.php

@@ -271 +271 @@
           $categories = $core->blog->getCategories(array('post_type'=>'post'));
           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;
+                    $catparents_combo[] = $categories_combo[] = new formSelectOption(
+                         str_repeat('&nbsp;&nbsp;',$categories->level-1).($categories->level-1 == 0 ? '' : '&bull; ').html::escapeHTML($categories->cat_title),
+                         $categories->cat_id
+                    );
                }
           }