Merge remote-tracking branch 'origin/release_3.1.2' into devel

2026-04-15 20:41:49 -05:00 · 2017-03-21 10:39:16 -04:00
parent 1b392a8ad5 301a088922
commit a69dfced74
74 changed files with 872 additions and 258 deletions
--- a/awx/ui/client/src/credentials/add/credentials-add.controller.js
+++ b/awx/ui/client/src/credentials/add/credentials-add.controller.js
@@ -23,6 +23,7 @@ export default ['$scope', '$rootScope', '$compile', '$location',
        init();

        function init() {
+            $scope.canEditOrg = true;
            // Load the list of options for Kind
            GetChoices({
                scope: $scope,