From 9c3ad1d523b7eaf2a357bb13bbe9443c52297fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lex=20Hermida?= <alexhermida@gmail.com>
Date: Thu, 9 Aug 2018 12:29:01 +0200
Subject: [PATCH] Fix load filter in link to epic from US

---
 app/coffee/modules/common/lightboxes.coffee           | 11 ++++++++++-
 .../common/lightbox/lightbox-relate-to-epic.jade      |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index 749935b1..3f090525 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -1139,6 +1139,7 @@ tgResources, $tgResources, $epicsService, tgAnalytics) ->
         $scope.projects = null
         $scope.projectEpics = Immutable.List()
         $scope.loading = false
+        $scope.selectedProject = $scope.project.id
 
         newEpicForm = $el.find(".new-epic-form").checksley()
         existingEpicForm = $el.find(".existing-epic-form").checksley()
@@ -1165,6 +1166,11 @@ tgResources, $tgResources, $epicsService, tgAnalytics) ->
                     filteredData = data.filter((epic) -> excludeIds.indexOf(epic.get('id')) == -1)
                     $scope.projectEpics = filteredData
 
+        selectProject = (selectedProjectId) ->
+            $scope.selectedEpic = null
+            $scope.searchEpic = ""
+            filterEpics(selectedProjectId, $scope.searchEpic)
+
         $el.on "click", ".close", (event) ->
             event.preventDefault()
             lightboxService.close($el)
@@ -1174,13 +1180,16 @@ tgResources, $tgResources, $epicsService, tgAnalytics) ->
             $scope.selectedEpic = null
             $scope.searchEpic = ""
             loadProjects()
-            filterEpics(item.projectId, $scope.searchEpic).then () ->
+            filterEpics($scope.selectedProject, $scope.searchEpic).then () ->
                 lightboxService.open($el).then ->
                     $el.find('input').focus
 
         $scope.$on "$destroy", ->
             $el.off()
 
+        $scope.selectProject = (selectedProjectId) ->
+            selectProject(selectedProjectId)
+
         $scope.onUpdateSearchEpic = debounceLeading 300, () ->
             $scope.selectedEpic = null
             filterEpics($scope.selectedProject, $scope.searchEpic)
diff --git a/app/partials/common/lightbox/lightbox-relate-to-epic.jade b/app/partials/common/lightbox/lightbox-relate-to-epic.jade
index af10ee0f..b8857f60 100644
--- a/app/partials/common/lightbox/lightbox-relate-to-epic.jade
+++ b/app/partials/common/lightbox/lightbox-relate-to-epic.jade
@@ -26,7 +26,7 @@ tg-lightbox-close
             )
             label.e2e-new-epic-label(for="new-epic")
                 span.name {{ 'LIGHTBOX.RELATE_TO_EPIC.NEW_EPIC' | translate}}
-        
+
     fieldset.project-selector
         label(
             ng-if="relatedWithSelector=='new-epic'"