From e13ab513638e01395e0f6df3005e9527364ee011 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Tue, 6 Mar 2018 09:11:44 +0100
Subject: [PATCH] [database][models] Fixed get_by_natural_key of
DatabaseSetOutputManager
The natural key generate was using a tuple in a tuple (which is good)
however the get_by_natural_key method was expecting a flat tuple.
---
beat/web/databases/models.py | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/beat/web/databases/models.py b/beat/web/databases/models.py
index 3d8f54475..dfe5f4730 100755
--- a/beat/web/databases/models.py
+++ b/beat/web/databases/models.py
@@ -437,15 +437,10 @@ class DatabaseSetTemplateOutput(models.Model):
class DatabaseSetOutputManager(models.Manager):
-
- def get_by_natural_key(self, database_name, database_version, protocol_name, name,
- template_name, output_name):
+ def get_by_natural_key(self, set_natural_key, output_name):
+ set_ = DatabaseSet.objects.get_by_natural_key(*set_natural_key)
return self.get(
- set__protocol__database__name=database_name,
- set__protocol__database__version=database_version,
- set__protocol__name=protocol_name,
- set__name=name,
- set__template__name=template_name,
+ set=set_,
template__name=output_name,
)
--
GitLab