zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-03 13:21:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

improve parsing of JSON inputs

Browse Source 
see: https://github.com/ansible/awx/issues/4573
see: https://github.com/ansible/awx/issues/2371
This commit is contained in:
Ryan Petrello
2019-08-26 18:08:01 -04:00
parent 9e849ad3e6
commit f22adca6f7
8 changed files with 88 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/models/activity_stream.py
View File

@@ -4,6 +4,7 @@
# Tower
from awx.api.versioning import reverse
from awx.main.fields import JSONField
from awx.main.models.base import accepts_json
# Django
from django.db import models
@@ -34,7 +35,7 @@ class ActivityStream(models.Model):
actor = models.ForeignKey('auth.User', null=True, on_delete=models.SET_NULL, related_name='activity_stream')
operation = models.CharField(max_length=13, choices=OPERATION_CHOICES)
timestamp = models.DateTimeField(auto_now_add=True)
changes = models.TextField(blank=True)
changes = accepts_json(models.TextField(blank=True))
deleted_actor = JSONField(null=True)
action_node = models.CharField(
blank=True,