From af7ec17ccddf840908fa90c18cdfa8395b9064d6 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Fri, 25 May 2018 17:21:43 -0400
Subject: [PATCH] fix a few minor issues that have broken the User Token
 creation

see: https://github.com/ansible/tower/issues/1928
---
 awx/api/serializers.py                                    | 2 +-
 .../features/users/tokens/users-tokens-add.controller.js  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index ebe019ddb9..9a27eadf0c 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -1073,7 +1073,7 @@ class UserAuthorizedTokenSerializer(BaseOAuth2TokenSerializer):
         validated_data['expires'] = now() + timedelta(
             seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS']
         )
-        obj = super(OAuth2TokenSerializer, self).create(validated_data)
+        obj = super(UserAuthorizedTokenSerializer, self).create(validated_data)
         obj.save()
         if obj.application is not None:
             RefreshToken.objects.create(
diff --git a/awx/ui/client/features/users/tokens/users-tokens-add.controller.js b/awx/ui/client/features/users/tokens/users-tokens-add.controller.js
index 1421077b1c..8e01fe5a3f 100644
--- a/awx/ui/client/features/users/tokens/users-tokens-add.controller.js
+++ b/awx/ui/client/features/users/tokens/users-tokens-add.controller.js
@@ -42,11 +42,11 @@ function AddTokensController (
         required: true,
         _component: 'at-input-select',
         _data: [
-            strings.get('add.SCOPE_PLACEHOLDER'),
-            strings.get('add.SCOPE_READ_LABEL'),
-            strings.get('add.SCOPE_WRITE_LABEL')
+            { label: strings.get('add.SCOPE_PLACEHOLDER'), value: '' },
+            { label: strings.get('add.SCOPE_READ_LABEL'), value: 'read' },
+            { label: strings.get('add.SCOPE_WRITE_LABEL'), value: 'write' }
         ],
-        _exp: 'choice for (index, choice) in state._data',
+        _exp: 'choice.value as choice.label for (index, choice) in state._data',
         _format: 'array'
     };