git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'new_paginator'
[philo.git]
/
models
/
base.py
diff --git
a/models/base.py
b/models/base.py
index
81e557f
..
7a872ca
100644
(file)
--- a/
models/base.py
+++ b/
models/base.py
@@
-53,6
+53,7
@@
class Attribute(models.Model):
class Meta:
app_label = 'philo'
class Meta:
app_label = 'philo'
+ unique_together = ('key', 'entity_content_type', 'entity_object_id')
value_content_type_limiter = ContentTypeRegistryLimiter()
value_content_type_limiter = ContentTypeRegistryLimiter()
@@
-81,6
+82,7
@@
class Relationship(models.Model):
class Meta:
app_label = 'philo'
class Meta:
app_label = 'philo'
+ unique_together = ('key', 'entity_content_type', 'entity_object_id')
class QuerySetMapper(object, DictMixin):
class QuerySetMapper(object, DictMixin):
@@
-273,7
+275,7
@@
class TreeModel(models.Model):
abstract = True
abstract = True
-class TreeEntity(
TreeModel, Entity
):
+class TreeEntity(
Entity, TreeModel
):
@property
def attributes(self):
if self.parent:
@property
def attributes(self):
if self.parent: