diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-01-27 00:53:03 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-01-27 00:53:03 +0100 |
| commit | 509a78e4d3196bba7df9c7630a15f3a0fc29a486 (patch) | |
| tree | 85c5aa786df79d8c8a0f44876d6f809ba10a53d5 /ishtar_common/models.py | |
| parent | ab8b469b6fcba1dd450356938ad63498c4c38c71 (diff) | |
| parent | dfae9be92081a677d3cbc4b3469866ef4fcd96dc (diff) | |
| download | Ishtar-509a78e4d3196bba7df9c7630a15f3a0fc29a486.tar.bz2 Ishtar-509a78e4d3196bba7df9c7630a15f3a0fc29a486.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index c900e028e..d7e63856b 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2010-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -1115,7 +1115,8 @@ class Merge(models.Model): blank=True, null=True) merge_exclusion = models.ManyToManyField("self", blank=True, null=True) - exclude_from_merge = models.BooleanField(default=False) + exclude_from_merge = models.NullBooleanField(default=False, + blank=True, null=True) # 1 for one word similarity, 2 for two word similarity, etc. MERGE_CLEMENCY = None EMPTY_MERGE_KEY = '--' |