[BUG FIX] Order of dropped item was off by 1

Acts as list uses 1 based position, rather than 0 based order.

Author: peakpg

app/assets/javascripts/cms/new-sitemap.js

@@ -139,20 +139,20 @@ Sitemap.prototype.enableMenuButtons = function() {
 
 // @param [Number] node_id
 // @param [Number] target_node_id
-// @param [Number] order
-Sitemap.prototype.move_to = function(node_id, target_node_id, order) {
+// @param [Number] position A 1 based position for order
+Sitemap.prototype.move_to = function(node_id, target_node_id, position) {
  var path = "/cms/section_nodes/" + node_id + '/move_to_position'
  $.cms_ajax.put({
  url: path,
  data: {
  target_node_id: target_node_id,
- position: order
+ position: position
  },
  success: function(result) {
  sitemap.clickWebsite();
  }
  });
- console.log("Dropping node", node_id, "into", target_node_id, "at", order);
+ console.log("Dropping node", node_id, "into", target_node_id, "at position", position);
 
 };
 var sitemap = new Sitemap();
@@ -174,7 +174,7 @@ $(function() {
  stop: function(event, ui) {
  var parent_section = ui.item.parents('ul:first');
  var moving_node_id = ui.item.children('a:first').data('node-id');
- sitemap.move_to(moving_node_id, parent_section.data('node-id'), ui.item.index());
+ sitemap.move_to(moving_node_id, parent_section.data('node-id'), ui.item.index() + 1);
  }
  });
 

app/models/cms/section_node.rb

@@ -75,7 +75,7 @@ def move_to(section, position)
  #This helps prevent the position from getting out of whack
  #If you pass in a really high number for position, 
  #this just corrects it to the right number
- node_count =Cms::SectionNode.count(:conditions => {:ancestry => ancestry})
+ node_count = Cms::SectionNode.count(:conditions => {:ancestry => ancestry})
  position = node_count if position > node_count
  end
 

todo_ui_Revamp.md

@@ -2,7 +2,6 @@ Tasks:
 
 - Move sitemap items
 -- [BUG] After moving a node, the section_node_ids are probably wrong. This means moving a node twice won't work (though it will appear to).
--- [BUG] Can't move an item into the 'last' position in a section (It ends up as the 2nd to last).
 -- It's hard visually to drop items into a section (especially if empty). (Should create obvious drop targets when you start dragging).
 -- Need to expand sections as you pass over them.
 -- Need an image/section name for hover element when it leaves a parent section.