External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-25 00:11:23 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1924 from anoek/devel

Browse Source 
Turn off activity stream flag in the UI if we have it explicitly disabled in our settings file
This commit is contained in:
Akita Noek 2016-05-17 09:02:59 -04:00
commit b2d7918912
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/views.py
View File

@ -202,6 +202,8 @@ class ApiV1ConfigView(APIView):
license_reader = TaskSerializer()
license_data = license_reader.from_database(show_key=request.user.is_superuser)
if license_data and 'features' in license_data and 'activity_streams' in license_data['features']:
license_data['features']['activity_streams'] &= tower_settings.ACTIVITY_STREAM_ENABLED
pendo_state = tower_settings.PENDO_TRACKING_STATE if tower_settings.PENDO_TRACKING_STATE in ('off', 'anonymous', 'detailed') else 'off'