Merge branch 'master' of https://gitlab.pasteur.fr/odoppelt/iPPIDB

Former-commit-id: f9937dd9bccdfec5f0b86cc8cca805c50bad4001

.gitlab-ci.yml

@@ -26,10 +26,12 @@ deploy-webserver:
     - mkdir -p ~/.ssh
     - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
   script:
-    - yum install -y epel-release
+    - yum install -y epel-release wget
     - yum install -y gcc
-    - yum install -y python34-pip python34-devel
-    - pip3 install ansible
+    - wget https://centos7.iuscommunity.org/ius-release.rpm
+    - rpm -Uvh ius-release*.rpm
+    - yum install -y python35u python35u-libs python35u-devel python35u-pip
+    - pip3.5 install ansible
     - cd ansible
     - whoami
     - ansible-playbook -vvv -i ./hosts_deploy deploy.yaml --extra-vars "deploy_user_name=ippidb repo_api_token=JZS-4cH7bWkFkHa2rAVf"

ippisite/ippidb/views.py

@@ -74,8 +74,9 @@ class IppiWizard(NamedUrlSessionWizardView):
 
     def get_context_data(self, **kwargs):
         context=super(IppiWizard, self).get_context_data(**kwargs)
-        context['complex_type']=self.storage.get_step_data('ProteinDomainComplexTypeForm').get('complex_type')
-        context['complex_choice']=self.storage.get_step_data('ProteinDomainComplexTypeForm').get('complex_choice')
+        if self.steps.current == 'ProteinDomainComplexForm':
+            context['complex_type']=self.storage.get_step_data('ProteinDomainComplexTypeForm').get('complex_type')
+            context['complex_choice']=self.storage.get_step_data('ProteinDomainComplexTypeForm').get('complex_choice')
         return context 
 
     def get_template_names(self):