Index: draggableviews.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/draggableviews/draggableviews.inc,v
retrieving revision 1.7.2.28
diff -r1.7.2.28 draggableviews.inc
162c162
<         $info['nodes'][$row->nid]['order'][0] = (int)($row->{$info['order']['field']['field_alias']});
---
>         $info['nodes'][$row->{$view->base_field}]['order'][0] = (int)($row->{$info['order']['field']['field_alias']});
165,166c165,167
<         // Default position of new nodes.
<         $info['nodes'][$row->nid]['order'][0] = $info['default_on_top'] == 1 ? -1 : $view->total_rows;
---
>         // Default position of new nodes. We cannot use $view->total_rows instead of 99999999 because
>         // $view->total_rows will not be calculated if paging is not used.
>         $info['nodes'][$row->{$view->base_field}]['order'][0] = $info['default_on_top'] == 1 ? -1 : 99999999;
169c170
<         $info['nodes'][$row->nid]['parent'] = (int)($row->{$info['hierarchy']['field']['field_alias']});
---
>         $info['nodes'][$row->{$view->base_field}]['parent'] = (int)($row->{$info['hierarchy']['field']['field_alias']});
180,182c181,184
<  * I used the word "Quick" because only visible nodes and only the very top hierarchy level will be checked. If the
<  * return is TRUE we can be sure that the structure will be displayed correctly. But errors that don't affect the
<  * current output can not be detected. Enhanced checks will be done when we have to rebuild a broken structure.
---
>  * I used the word "Quick" because only visible nodes will be checked. If the
>  * return is TRUE we can be sure that the structure will be displayed correctly.
>  * But errors that don't affect the current output can not be detected.
>  * Enhanced checks will be done when we have to rebuild a broken structure.
185,186c187,190
<  *  - Wrong order values: The order values must constantly increase by 1, independent of the hierarchy level.
<  *  - Parent mismatch: The parent_nid must equal with the nid we memorized before we entered the current hierarchy level.
---
>  *  - Wrong order values: The order values must constantly increase by 1,
>  *     independent of the hierarchy level.
>  *  - Parent mismatch: The parent_nid must equal with the nid we memorized
>  *     before we entered the current hierarchy level.
297c301,302
<   // Last but not least sort nodes and finally assign ascending numbers. This is necessary since this module supports paging.
---
>   // Last but not least sort nodes and finally assign ascending numbers.
>   // This is necessary since this module supports paging.
332,334c337,342
<   // The child node order values on the parent's level have to equal with the parent's order values. If they don't they will be set properly.
<   // In order to avoid ambiguous values we add unique float values ($safe_offset < 1) to all order values. This assures that
<   // child nodes always appear right after their parents even if there are other nodes with the same order value on the parents level.
---
>   // The child node order values on the parent's level have to equal
>   // with the parent's order values. If they don't equal they will be set properly.
>   // In order to avoid ambiguous values we add unique float
>   // values ($safe_offset < 1) to all order values. This assures that
>   // child nodes always appear right after their parents even if there
>   // are other nodes with the same order value on the parents level.
342,344c350,352
<   // The last issue we have to deal with is the order itself. Probably there
<   // are more many with the same order value what could lead to display errors.
<   // We just sort the nodes by their current order values and then we subsequently assign ascending numbers.
---
>   // The last issue we have to deal with is the order itself.
>   // We just sort the nodes by their current order values and
>   // then we subsequently assign ascending numbers.
