diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d6fb36fbff3401a4186c11a892c0e32538eccbd..1756242fc2512b415845ea5b4bf37e878569467a 100644 --- a/.gitlab-ci.yml +++ b/.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" diff --git a/ippisite/ippidb/views.py b/ippisite/ippidb/views.py index 3d63a0a52eb20f7a4fe1a86c0ecde47e4862c188..00ea6df6519d097da0ec1bb5404a980bc9b14f96 100644 --- a/ippisite/ippidb/views.py +++ b/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):