Skip to content

Commit

Permalink
Merge branch 'developer' of git.vstconsulting.net:polemarch/ce into 2…
Browse files Browse the repository at this point in the history
…22-gui-fix-ci_template
  • Loading branch information
akhmadullin committed Aug 6, 2019
2 parents 25d29d5 + 2cb7f5b commit 4a3c8d3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion polemarch/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"VST_ROOT_URLCONF": os.getenv("VST_ROOT_URLCONF", 'vstutils.urls'),
}

__version__ = "1.3.1"
__version__ = "1.4.0"

prepare_environment(**default_settings)
3 changes: 1 addition & 2 deletions polemarch/api/v2/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from ...main.utils import AnsibleArgumentsReference, AnsibleInventoryParser

from ...main.models import Inventory
from ...main.repo._base import _Base as base_repo_class
from ...main import models
from ..signals import api_post_save, api_pre_save

Expand Down Expand Up @@ -420,7 +419,7 @@ class PeriodicTaskVariableSerializer(VariableSerializer):
class ProjectVariableSerializer(VariableSerializer):
key = vst_fields.AutoCompletionField(
required=True,
autocomplete=models.Project.VARS_KEY+['ci_'+i for i in base_repo_class.handler_class.ci_types.keys()]
autocomplete=models.Project.VARS_KEY+['ci_template']
)
value = vst_fields.DependEnumField(allow_blank=True, field='key', choices={
'repo_type': list(models.Project.repo_handlers.keys()),
Expand Down

0 comments on commit 4a3c8d3

Please sign in to comment.