Skip to content

Commit

Permalink
Merge pull request #123 from machristie/dev
Browse files Browse the repository at this point in the history
config_app is optional, only delete if provided
  • Loading branch information
nuwang authored Dec 18, 2017
2 parents cd6cf09 + c1c9213 commit 93c2621
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion django-cloudlaunch/cloudlaunch/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ def create(self, validated_data):
final_ud_config)

del validated_data['application']
del validated_data['config_app']
if 'config_app' in validated_data:
del validated_data['config_app']
validated_data['owner_id'] = request.user.id
validated_data['application_config'] = json.dumps(merged_config)
validated_data['credentials_id'] = credentials.get('id') or None
Expand Down

0 comments on commit 93c2621

Please sign in to comment.