Merge pull request #599 from SEED-platform/593-fix-view-project

Update controller and view fix missing .project bug
SEED-platform · Dec 18, 2015 · 2a9c927 · 2a9c927
2 parents 857b58d + 07b8aac
commit 2a9c927
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/seed/static/seed/js/controllers/building_list_controller.js b/seed/static/seed/js/controllers/building_list_controller.js
@@ -59,7 +59,8 @@ angular.module('BE.seed.controller.building_list', [])
     $scope.assessor_fields = [];
     $scope.create_project_error = false;
     $scope.create_project_error_message = "";
-
+    $scope.selected_existing_project = null;
+
 
     /**
     * SEARCH CODE
@@ -188,6 +189,17 @@ angular.module('BE.seed.controller.building_list', [])
     /**
      * PROJECTS CODE
      */
+
+    $scope.begin_add_buildings_to_new_project = function() {
+        $scope.set_initial_project_state();
+    };
+
+    $scope.begin_add_buildings_to_existing_project = function(){
+        $scope.selected_existing_project = null;
+        $scope.create_project_state='create';
+    };
+
+
     $scope.nothing_selected = function() {
         if ($scope.search.selected_buildings.length === 0 &&
             $scope.search.select_all_checkbox === false) {

diff --git a/seed/static/seed/partials/buildings.html b/seed/static/seed/partials/buildings.html
@@ -38,12 +38,12 @@ <h1><i class="fa fa-building-o"></i> {$ search.number_matching_search | number:0
                     <li ng-hide="menu.user.organization.user_role === 'viewer'">
                         <a  data-toggle="modal" 
                             data-target="#newProjectModal" 
-                            ng-click="set_initial_project_state()">
+                            ng-click="begin_add_buildings_to_new_project()">
                             Create a new project</a></li>
                     <li ng-hide="menu.user.organization.user_role === 'viewer'">
                         <a  data-toggle="modal" 
                             data-target="#existingProjectModal" 
-                            ng-click="create_project_state='create'">
+                            ng-click="begin_add_buildings_to_existing_project()">
                             Add to an existing project</a></li>
                     <li ng-hide="menu.user.organization.user_role === 'viewer'">
                         <a ng-click="open_delete_modal()">Delete Buildings</a></li>
@@ -209,7 +209,10 @@ <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state
         <div class="form-group" ng-show="create_project_state == 'create'">
             <label class="sr-only" for="projectName">Project Name</label>
             <div class="col-sm-8">
-                <select class="form-control" id="existingProjectName" ng-options="p as p.name for p in projects" ng-model="project"></select>
+                <select class="form-control" 
+                        id="existingProjectName" 
+                        ng-options="p as p.name for p in projects" 
+                        ng-model="selected_existing_project"></select>
             </div>
         </div>
         <div class="col-sm-7" ng-show="create_project_state == 'adding'">
@@ -231,7 +234,7 @@ <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state
                 Cancel</button>
         <button type="button" 
                 class="btn btn-primary" 
-                ng-click="add_buildings(project.slug)" 
+                ng-click="add_buildings(selected_existing_project.slug)" 
                 ng-show="create_project_state == 'create'">
                 Add to Project</button>
         <button type="button"