Add a weight column to the items model. Change the album ordering to

use this as the default instead of id.  This prepares the way for
manual reordering in the organize functionality.

2 files changed, 4 insertions, 4 deletions

diff --git a/core/tests/Albums_Controller_Test.php b/core/tests/Albums_Controller_Test.php
index b43ae01b..747b7427 100644
--- a/core/tests/Albums_Controller_Test.php
+++ b/core/tests/Albums_Controller_Test.php
@@ -31,7 +31,7 @@ class Albums_Controller_Test extends Unit_Test_Case {
     $_POST["name"] = "new name";
     $_POST["title"] = "new title";
     $_POST["description"] = "new description";
-    $_POST["column"] = "id";
+    $_POST["column"] = "weight";
     $_POST["direction"] = "ASC";
     $_POST["csrf"] = access::csrf_token();
     $_POST["_method"] = "put";
diff --git a/core/tests/ORM_MPTT_Test.php b/core/tests/ORM_MPTT_Test.php
index 2aeea58c..f443862b 100644
--- a/core/tests/ORM_MPTT_Test.php
+++ b/core/tests/ORM_MPTT_Test.php
@@ -29,7 +29,7 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $album = ORM::factory("item");
     $album->type = "album";
     $album->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
-    $album->sort_column = "id";
+    $album->sort_column = "weight";
     $album->sort_order = "ASC";
     $album->add_to_parent($root);
 
@@ -155,7 +155,7 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $parent = ORM::factory("item");
     $parent->type = "album";
     $parent->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
-    $parent->sort_column = "id";
+    $parent->sort_column = "weight";
     $parent->sort_order = "ASC";
     $parent->add_to_parent($root);
 
@@ -166,7 +166,7 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $album1 = ORM::factory("item");
     $album1->type = "album";
     $album1->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
-    $album1->sort_column = "id";
+    $album1->sort_column = "weight";
     $album1->sort_order = "ASC";
     $album1->add_to_parent($parent);