shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge pull request #90 from ryanpetrello/fix-7320

Browse Source 
fix a few activity stream bugs related to setting creation/update
This commit is contained in:
Ryan Petrello 2017-07-27 12:02:28 -04:00 committed by GitHub
commit 53700c10b9
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/conf/models.py
View File

@ -65,8 +65,10 @@ class Setting(CreatedModifiedModel):
# After saving a new instance for the first time, set the encrypted # After saving a new instance for the first time, set the encrypted
# field and save again. # field and save again.
if encrypted and new_instance: if encrypted and new_instance:
self.value = self._saved_value from awx.main.signals import disable_activity_stream
self.save(update_fields=['value']) with disable_activity_stream():
self.value = self._saved_value
self.save(update_fields=['value'])
@classmethod @classmethod
def get_cache_key(self, key): def get_cache_key(self, key):

6
awx/main/utils/common.py
View File

@ -16,6 +16,7 @@ import urlparse
import threading import threading
import contextlib import contextlib
import tempfile import tempfile
import six
# Decorator # Decorator
from decorator import decorator from decorator import decorator
@ -325,7 +326,10 @@ def _convert_model_field_for_display(obj, field_name, password_fields=None):
return '<missing {}>-{}'.format(obj._meta.verbose_name, getattr(obj, '{}_id'.format(field_name))) return '<missing {}>-{}'.format(obj._meta.verbose_name, getattr(obj, '{}_id'.format(field_name)))
if password_fields is None: if password_fields is None:
password_fields = set(getattr(type(obj), 'PASSWORD_FIELDS', [])) | set(['password']) password_fields = set(getattr(type(obj), 'PASSWORD_FIELDS', [])) | set(['password'])
if field_name in password_fields: if field_name in password_fields or (
isinstance(field_val, six.string_types) and
field_val.startswith('$encrypted$')
):
return u'hidden' return u'hidden'
if hasattr(obj, 'display_%s' % field_name): if hasattr(obj, 'display_%s' % field_name):
field_val = getattr(obj, 'display_%s' % field_name)() field_val = getattr(obj, 'display_%s' % field_name)()