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

Update settings serializer to allow empty/blank values.

Browse Source
This commit is contained in:
Chris Church
2016-02-11 18:11:32 -05:00
parent a8fec62095
commit dc298daeb4
4 changed files with 73 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
awx/api/serializers.py
View File

@@ -44,7 +44,7 @@ from awx.main.redact import REPLACE_STR
from awx.main.conf import tower_settings
from awx.api.license import feature_enabled
from awx.api.fields import BooleanNullField, CharNullField, ChoiceNullField, EncryptedPasswordField
from awx.api.fields import BooleanNullField, CharNullField, ChoiceNullField, EncryptedPasswordField, VerbatimField
from awx.fact.models import * # noqa
@@ -2216,6 +2216,8 @@ class ActivityStreamSerializer(BaseSerializer):
class TowerSettingsSerializer(BaseSerializer):
value = VerbatimField()
class Meta:
model = TowerSettings
fields = ('key', 'description', 'category', 'value', 'value_type', 'user')
@@ -2249,14 +2251,20 @@ class TowerSettingsSerializer(BaseSerializer):
manifest = settings.TOWER_SETTINGS_MANIFEST
if attrs['key'] not in manifest:
raise serializers.ValidationError(dict(key=["Key {0} is not a valid settings key".format(attrs['key'])]))
# TODO: Type checking/coercion, contextual validation
return super(TowerSettingsSerializer, self).validate(attrs)
def _create(self, validated_data):
current_val = TowerSettings.objects.filter(key=validated_data['key'])
if current_val.exists():
return self.update(current_val[0], validated_data)
return super(TowerSettingsSerializer, self).create(validated_data)
if attrs['value_type'] == 'json':
attrs['value'] = json.dumps(attrs['value'])
elif attrs['value_type'] == 'list':
try:
attrs['value'] = ','.join(map(force_text, attrs['value']))
except TypeError:
attrs['value'] = force_text(attrs['value'])
elif attrs['value_type'] == 'bool':
attrs['value'] = force_text(bool(attrs['value']))
else:
attrs['value'] = force_text(attrs['value'])
return super(TowerSettingsSerializer, self).validate(attrs)
class AuthTokenSerializer(serializers.Serializer):