External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix an issue where the single_fact view could still generate a 500 error

Browse Source 
if mongo wasn't running and system tracking was disabled by the license
This commit is contained in:
Matthew Jones
2015-05-28 16:19:55 -04:00
parent 5b3b4b48c0
commit 094072f9dc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -39,6 +39,8 @@ from awx.main.models import * # noqa
from awx.main.utils import get_type_for_model, get_model_for_type, build_url, timestamp_apiformat from awx.main.utils import get_type_for_model, get_model_for_type, build_url, timestamp_apiformat
from awx.main.redact import REPLACE_STR from awx.main.redact import REPLACE_STR
from awx.api.license import feature_enabled
from awx.fact.models import * # noqa from awx.fact.models import * # noqa
logger = logging.getLogger('awx.api.serializers') logger = logging.getLogger('awx.api.serializers')
@@ -415,7 +417,7 @@ class BaseFactSerializer(MongoEngineModelSerializer):
def get_fields(self): def get_fields(self):
ret = super(BaseFactSerializer, self).get_fields() ret = super(BaseFactSerializer, self).get_fields()
if 'module' in ret: if 'module' in ret and feature_enabled('system_tracking'):
choices = [(o, o) for o in FactVersion.objects.all().only('module').distinct('module')] choices = [(o, o) for o in FactVersion.objects.all().only('module').distinct('module')]
ret['module'] = ChoiceField(source='module', choices=choices, read_only=True, required=False) ret['module'] = ChoiceField(source='module', choices=choices, read_only=True, required=False)
return ret return ret