From b187fb6b5f63cf0590639a9e866a14c63d231042 Mon Sep 17 00:00:00 2001
From: Jaden Diefenbaugh <blakcap@users.noreply.github.com>
Date: Mon, 13 Feb 2017 17:41:01 +0100
Subject: [PATCH] revert model & serializer changes, will save groups in
content instead
---
beat/web/reports/models.py | 10 ----------
beat/web/reports/serializers.py | 13 +------------
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/beat/web/reports/models.py b/beat/web/reports/models.py
index d467380bf..4a2c87c78 100644
--- a/beat/web/reports/models.py
+++ b/beat/web/reports/models.py
@@ -334,13 +334,3 @@ class Report(models.Model):
alias_list = map(lambda x: report_content["alias_experiments"][x], experiments_list)
return experiments_list, alias_list
-
-#----------------------------------------------------------
-
-
-class Group(models.Model):
- #_____ Fields __________
-
- name = models.CharField(max_length=200, blank=False)
- experiments = models.ManyToManyField(Experiment, related_name='groups', blank=True)
- report = models.ForeignKey(Report, related_name='groups', blank=True, on_delete=models.CASCADE)
diff --git a/beat/web/reports/serializers.py b/beat/web/reports/serializers.py
index c53c6c655..bc87f2f1c 100644
--- a/beat/web/reports/serializers.py
+++ b/beat/web/reports/serializers.py
@@ -53,7 +53,6 @@ class BasicReportSerializer(serializers.ModelSerializer):
analyzer = serializers.SerializerMethodField()
html_description = serializers.SerializerMethodField()
add_url = serializers.SerializerMethodField()
- groups = serializers.SerializerMethodField()
class Meta:
model = Report
@@ -102,16 +101,6 @@ class BasicReportSerializer(serializers.ModelSerializer):
def get_add_url(self, obj):
return obj.get_api_add_url()
- def get_groups(self, obj):
- groups = dict()
- for g in groups:
- exps = list()
- for e in g.experiments:
- exps.append(e.name)
- groups[g.name] = exps
-
- return groups
-
#----------------------------------------------------------
@@ -129,7 +118,7 @@ class FullReportSerializer(BasicReportSerializer):
class Meta(BasicReportSerializer.Meta):
- fields = ['name', 'number', 'short_description', 'description', 'is_owner', 'author','status', 'creation_date', 'publication_date', 'experiments', 'analyzer', 'content', 'html_description', 'groups']
+ fields = ['name', 'number', 'short_description', 'description', 'is_owner', 'author','status', 'creation_date', 'publication_date', 'experiments', 'analyzer', 'content', 'html_description']
#----------------------------------------------------------
--
GitLab