From 8a3a0d219c880099804b191931c5cd587f9449e7 Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouse@ansibleworks.com>
Date: Mon, 4 Nov 2013 07:20:46 +0000
Subject: [PATCH] Fixed form validation issues on Projects detail for manual
 projects. When editing an existing project, local_path value was not being
 set, even though it diplayed properly. Changed local_path from array of
 strings to array of objects. Now local_path values are sorted and the correct
 object in the list is selected.

---
 awx/ui/static/js/controllers/Projects.js | 8 +++++++-
 awx/ui/static/js/helpers/ProjectPath.js  | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/awx/ui/static/js/controllers/Projects.js b/awx/ui/static/js/controllers/Projects.js
index 3749477926..fa13092afe 100644
--- a/awx/ui/static/js/controllers/Projects.js
+++ b/awx/ui/static/js/controllers/Projects.js
@@ -305,9 +305,12 @@ function ProjectsAdd ($scope, $rootScope, $compile, $location, $log, $routeParam
            }
        }
        data.scm_type = scope.scm_type.value;
-       if (data.scm_type.value !== '') {
+       if (scope.scm_type.value !== '') {
           delete data.local_path;
        }
+       else {
+          data.local_path = scope.local_path.value;
+       }
 
        var url = (base == 'teams') ? GetBasePath('teams') + $routeParams.team_id + '/projects/' : defaultUrl;
        Rest.setUrl(url);
@@ -515,6 +518,9 @@ function ProjectsEdit ($scope, $rootScope, $compile, $location, $log, $routePara
        if (scope.scm_type.value !== '') {   
           delete params.local_path;
        }
+       else {
+          params.local_path = scope.local_path.value;
+       }
 
        Rest.setUrl(defaultUrl);
        Rest.put(params)
diff --git a/awx/ui/static/js/helpers/ProjectPath.js b/awx/ui/static/js/helpers/ProjectPath.js
index aab5457877..a8df67f61a 100644
--- a/awx/ui/static/js/helpers/ProjectPath.js
+++ b/awx/ui/static/js/helpers/ProjectPath.js
@@ -59,6 +59,7 @@ angular.module('ProjectPathHelper', ['RestServices', 'Utilities'])
                     }
                 }
                 scope.base_dir = data.project_base_dir;
+                master.local_path = scope.local_path;
                 master.base_dir = scope.base_dir;  // Keep in master object so that it doesn't get
                                                    // wiped out on form reset.
                 if (opts.length == 0) {