diff --git a/ippisite/ippidb/views/contribute.py b/ippisite/ippidb/views/contribute.py index 2cd65b455b3937ff2d3d4436e647fcf9d06cc14c..25fc44b1f5045dc47348fcfdfc28fb2e0956a58e 100644 --- a/ippisite/ippidb/views/contribute.py +++ b/ippisite/ippidb/views/contribute.py @@ -6,20 +6,19 @@ from django.shortcuts import render from django.contrib.auth.mixins import LoginRequiredMixin from formtools.wizard.views import NamedUrlSessionWizardView -import ippidb -from ippidb.forms import * +from ippidb import forms as ippidb_forms from ippidb.models import Protein, Bibliography, ProteinDomainComplex, ProteinDomainBoundComplex, RefCompoundBiblio, TestActivityDescription, Compound, Ppi, Disease, Taxonomy, LeLleBiplotData, PcaBiplotData, PpiFamily, CompoundTanimoto, create_tanimoto from ippidb.ws import get_pdb_uniprot_mapping -FORMS = [("IdForm", ippidb.forms.IdForm), - ("BibliographyForm", ippidb.forms.BibliographyForm), - ("PDBForm", ippidb.forms.PDBForm), +FORMS = [("IdForm", ippidb_forms.IdForm), + ("BibliographyForm", ippidb_forms.BibliographyForm), + ("PDBForm", ippidb_forms.PDBForm), ("ProteinDomainComplexTypeForm", - ippidb.forms.ProteinDomainComplexTypeForm), - ("ProteinDomainComplexForm", ippidb.forms.ComplexCompositionFormSet), - ("PpiForm", ippidb.forms.PpiAndComplexForm), - ("CompoundForm", ippidb.forms.CompoundFormSet), - ("TestsForm", ippidb.forms.TestsFormSet), + ippidb_forms.ProteinDomainComplexTypeForm), + ("ProteinDomainComplexForm", ippidb_forms.ComplexCompositionFormSet), + ("PpiForm", ippidb_forms.PpiAndComplexForm), + ("CompoundForm", ippidb_forms.CompoundFormSet), + ("TestsForm", ippidb_forms.TestsFormSet), ] TEMPLATES = {"IdForm": "IdForm.html", @@ -51,9 +50,9 @@ class IppiWizard(LoginRequiredMixin, NamedUrlSessionWizardView): context['pdb_id'] = self.storage.get_step_data('PDBForm').get('PDBForm-pdb_id') return context - def get_form_kwargs(self, step): + def get_form_kwargs(self, step=None): # change args pass to a form - kwargs = super().get_form_kwargs() + kwargs = super().get_form_kwargs(step) if step == 'ProteinDomainComplexForm': pks = self.storage.get_step_data('PDBForm').get('pks') # print("test pks: ",pks)