diff --git a/ippisite/ippidb/views.py b/ippisite/ippidb/views.py index ddc731043ce42c509474af7d007d9facf6ff21c0..32d5c6cee66553e1649699602c7428359761dcfb 100644 --- a/ippisite/ippidb/views.py +++ b/ippisite/ippidb/views.py @@ -5,7 +5,7 @@ from django.http import HttpResponseRedirect from formtools.wizard.views import SessionWizardView,NamedUrlSessionWizardView from .forms import IdForm, BibliographyForm, PDBForm, ProteinForm, ProteinDomainComplexTypeForm, ProteinDomainComplexForm, PpiForm, ProteinFormSet, PDBFormSet -from .models import Protein, Bibliography +from .models import Protein, Bibliography, ProteinDomainComplex from .ws import get_pdb_uniprot_mapping def index(request): @@ -68,6 +68,9 @@ class IppiWizard(NamedUrlSessionWizardView): if self.steps.current=='ProteinForm': pks = self.storage.get_step_data('PDBForm').get('pks') return Protein.objects.filter(id__in=pks) + if self.steps.current=='ProteinDomainComplexForm': + complexType = self.storage.get_step_data('ProteinDomainComplexTypeForm').get('complexType') + return ProteinDomainComplex.objects.get(complexType=complexType) def process_step(self, form): """ @@ -97,6 +100,8 @@ class IppiWizard(NamedUrlSessionWizardView): p.save() protein_ids.append(p.id) data['pks'] = protein_ids + if self.steps.current=='ProteinDomainComplexTypeForm': + data['complex_type']=form['complexType'] return data def done(self, form_list, **kwargs):