From a352bdbbd91c466f7f355a4abc06c32ebd7436f0 Mon Sep 17 00:00:00 2001
From: Christophe Boulanger <christophe.boulanger@imio.be>
Date: Mon, 3 Apr 2017 14:03:25 +0200
Subject: [PATCH] import data from .json file

---
 passerelle_imio_ts1_datasources/models.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/passerelle_imio_ts1_datasources/models.py b/passerelle_imio_ts1_datasources/models.py
index 45dfb55..b675d6e 100644
--- a/passerelle_imio_ts1_datasources/models.py
+++ b/passerelle_imio_ts1_datasources/models.py
@@ -128,6 +128,7 @@ class ImioTs1Datasources(BaseResource):
     def get_destination_terms(self):
         return DestinationTerm.objects.all()
 
+<<<<<<< Updated upstream
     def export_json(self):
         d = super(ImioTs1Datasources, self).export_json()
         d['motivations'] = [x.export_json() for x in MotivationTerm.objects.all()]
@@ -154,6 +155,10 @@ class ImioTs1Datasources(BaseResource):
         DestinationTerm.objects.bulk_create(new)
 
         return instance
+=======
+    def motivationterms_import(self, request, **kwargs):
+        import pdb;pdb.set_trace()
+>>>>>>> Stashed changes
 
     @endpoint()
     def motivationterms(self, request, **kwargs):