Changeset 1595:0b564d837a35

Timestamp:

08/26/13 22:23:05 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Issue 1541 : Revert ordering without javascript, postponed to another milestone !

Location:

admin

Files:

• categories.php (modified) (5 diffs)
• js/_categories.js (modified) (1 diff)

admin/categories.php

@@ -56 +56 @@
 
 # Update order
-if (!empty($_POST['save_order']))
-{
-     if (!empty($_POST['categories_order'])) { // js is enable
-         $categories = json_decode($_POST['categories_order']);
-
-         foreach ($categories as $category) {
-           if (!empty($category->item_id)) {
-          $core->blog->updCategoryPosition($category->item_id, $category->left, $category->right);
-           }
-         }
-     } elseif (!empty($_POST['cat_rank'])) {
-          function countChildren($t, $id) {
-               $c = 0;
-               foreach ($t as $k => $v) {
-                    if (preg_match('`^'.$id.'\..*`', $k)) {
-                         $c++;
-                    }
-               }
-
-               return $c;
-          }
-
-          $i = 1;
-          $ranks = array_flip($_POST['cat_rank']);
-          uksort($ranks, 'version_compare');
-          foreach ($ranks as $str => $id) {
-               $core->blog->updCategoryPosition($id, $i, ($i + 2 * countChildren($ranks, $str) + 1));
-               $i = $i+2;
+if (!empty($_POST['save_order']) && !empty($_POST['categories_order'])) {
+     $categories = json_decode($_POST['categories_order']);
+
+     foreach ($categories as $category) {
+          if (!empty($category->item_id)) {
+               $core->blog->updCategoryPosition($category->item_id, $category->left, $category->right);
           }
      }
@@ -165 +143 @@
 
      $ref_level = $level = $rs->level-1;
-     $parts = array();
      while ($rs->fetch())
      {
@@ -172 +149 @@
           if ($rs->level > $level) {
                echo str_repeat('<ul><li '.$attr.'>',$rs->level - $level);
-               $parts[] = 1;
           } elseif ($rs->level < $level) {
                echo str_repeat('</li></ul>',-($rs->level - $level));
-               $parts = array_slice($parts,0,(count($parts) - ($level - $rs->level)));
-               $parts[count($parts)-1]++;
-          } else {
-               $parts[count($parts)-1]++;
           }
 
@@ -185 +157 @@
           }
 
-          $cat_rank = implode('.',$parts);
           echo
           '<p>'.
@@ -193 +164 @@
           sprintf(($rs->nb_post > 1 ? __('%d entries') : __('%d entry') ),$rs->nb_post).'</a>'.
           ', '.__('total:').' '.$rs->nb_total.') '.
-          '<span class="cat-url">'.__('URL:').' <code>'.html::escapeHTML($rs->cat_url).'</code></span>'.
-          form::field('cat_rank['.$rs->cat_id.']',10,10,$cat_rank,'cat-rank').
-          '</p>';
+          '<span class="cat-url">'.__('URL:').' <code>'.html::escapeHTML($rs->cat_url).'</code></span></p>';
 
           $level = $rs->level;

admin/js/_categories.js

@@ -1 +1 @@
 $(function() {
      if ($.fn['nestedSortable']!==undefined) {
-          $('.dragdrop-hidden, .cat-rank').hide();
           $('#categories ul li').css('cursor','move');
           $('#save-set-order').prop('disabled',true).addClass('disabled');