Changeset 292

Timestamp:

01/14/08 20:38:20 (5 years ago)

Author:

cleverdevil

Message:

Support compound primary keys in acts_as_list.

Files:

• elixir/trunk/elixir/ext/list.py (modified) (4 diffs)

elixir/trunk/elixir/ext/list.py

@@ -83 +83 @@
 __all__ = ['acts_as_list']
 __doc_all__ = []
+
+
+def get_entity_where(instance):
+    clauses = []
+    for column in instance.table.primary_key.columns:
+        instance_value = getattr(instance, column.name)
+        clauses.append(column==instance_value)
+    return and_(*clauses)
 
 
@@ -135 +143 @@
             # move this item to the max position
             self.table.update(
-                self.table.c.id == self.id,
+                get_entity_where(self),
                 values={
                     self.table.c.position : select(
@@ -158 +166 @@
 
             # move this item to the first position
-            self.table.update(self.table.c.id == self.id).execute(position=1)
+            self.table.update(get_entity_where(self)).execute(position=1)
             
         
@@ -184 +192 @@
             
             # update this item's position to the desired position
-            self.table.update(self.table.c.id==self.id).execute(position=position)
+            self.table.update(get_entity_where(self)).execute(position=position)