Merge pull request #4009 from cchurch/fix-callback-url-fields

Fix callback URL fields to update when TOWER_URL_BASE changes

awx/conf/views.py

@@ -67,7 +67,7 @@ class SettingSingletonDetail(RetrieveUpdateDestroyAPIView):
         if self.category_slug not in category_slugs:
             raise PermissionDenied()
 
-        registered_settings = settings_registry.get_registered_settings(category_slug=self.category_slug)
+        registered_settings = settings_registry.get_registered_settings(category_slug=self.category_slug, read_only=False)
         if self.category_slug == 'user':
             return Setting.objects.filter(key__in=registered_settings, user=self.request.user)
         else:

awx/sso/conf.py

@@ -511,6 +511,7 @@ register(
                 'callback URL for your application.'),
     category=_('Google OAuth2'),
     category_slug='google-oauth2',
+    depends_on=['TOWER_URL_BASE'],
 )
 
 register(
@@ -601,6 +602,7 @@ register(
                 'as the callback URL for your application.'),
     category=_('GitHub OAuth2'),
     category_slug='github',
+    depends_on=['TOWER_URL_BASE'],
 )
 
 register(
@@ -663,6 +665,7 @@ register(
                 'Provide this URL as the callback URL for your application.'),
     category=_('GitHub Organization OAuth2'),
     category_slug='github-org',
+    depends_on=['TOWER_URL_BASE'],
 )
 
 register(
@@ -736,6 +739,7 @@ register(
                 'Provide this URL as the callback URL for your application.'),
     category=_('GitHub Team OAuth2'),
     category_slug='github-team',
+    depends_on=['TOWER_URL_BASE'],
 )
 
 register(
@@ -812,6 +816,7 @@ register(
                 'and this callback URL for your application.'),
     category=_('SAML'),
     category_slug='saml',
+    depends_on=['TOWER_URL_BASE'],
 )
 
 register(