entrouvert
/
passerelle-imio-ts1-datasources
22
0
Fork 0
Code Issues Pull Requests Releases Activity

Save models.py because 'stash' bad lines

This commit is contained in:
Christophe Boulanger 2017-04-03 14:07:10 +02:00
parent 62d9bd009f
commit 6731207be8
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
passerelle_imio_ts1_datasources/models.py
View File

@ -128,7 +128,6 @@ 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()]
@ -155,10 +154,6 @@ 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):