aatish/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into task/4890/ssh_key_manage_for_ipv6

Browse source
This commit is contained in:
PCoder 2018-06-27 09:23:48 +02:00
commit a3db7f2e1a
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog
View file

@ -1,3 +1,5 @@
Next:
* bugfix: Fix flake8 error that was ignored in release 1.9.1
1.9.1: 2018-06-24 1.9.1: 2018-06-24
* #4799: [dcl] Show selected vm templates only in calculator (PR #638) * #4799: [dcl] Show selected vm templates only in calculator (PR #638)
* #4847: [comic] Add google analytics code for comic.ungleich.ch (PR #639) * #4847: [comic] Add google analytics code for comic.ungleich.ch (PR #639)

3
datacenterlight/cms_models.py
View file

@ -3,6 +3,7 @@ from cms.extensions.extension_pool import extension_pool
from cms.models.fields import PlaceholderField from cms.models.fields import PlaceholderField
from cms.models.pluginmodel import CMSPlugin from cms.models.pluginmodel import CMSPlugin
from django import forms from django import forms
from django.conf import settings
from django.contrib.postgres.fields import ArrayField from django.contrib.postgres.fields import ArrayField
from django.contrib.sites.models import Site from django.contrib.sites.models import Site
from django.db import models from django.db import models
@ -300,6 +301,8 @@ class MultipleChoiceArrayField(ArrayField):
Uses Django's Postgres ArrayField Uses Django's Postgres ArrayField
and a MultipleChoiceField for its formfield. and a MultipleChoiceField for its formfield.
""" """
VMTemplateChoices = []
if settings.OPENNEBULA_DOMAIN != 'test_domain':
VMTemplateChoices = list( VMTemplateChoices = list(
( (
str(obj.opennebula_vm_template_id), str(obj.opennebula_vm_template_id),