From 9624e2a290390f35a746680588a3c118b7924cc1 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Wed, 16 May 2018 13:44:21 +0100 Subject: [PATCH] Record the source project display name, to render with the file --- services/web/app/views/project/editor/binary-file.pug | 6 +++--- .../file-tree/controllers/FileTreeController.coffee | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/services/web/app/views/project/editor/binary-file.pug b/services/web/app/views/project/editor/binary-file.pug index eeb633a318..921ed5571d 100644 --- a/services/web/app/views/project/editor/binary-file.pug +++ b/services/web/app/views/project/editor/binary-file.pug @@ -52,9 +52,9 @@ div.binary-file.full-size( i.fa.fa-fw.fa-external-link-square.fa-rotate-180.linked-file-icon | Imported from | - a(ng-href='/project/{{openFile.linkedFileData.source_project_id}}') - | {{ displayUrl(openFile.linkedFileData.source_project_id) }} - |  / {{ openFile.linkedFileData.source_entity_path.slice(1) }}, + a(ng-href='/project/{{openFile.linkedFileData.source_project_id}}' target="_blank") + | {{ openFile.linkedFileData.source_project_display_name }} + |  {{ openFile.linkedFileData.source_entity_path.slice(1) }}, | | at {{ openFile.created | formatDate:'h:mm a' }} {{ openFile.created | relativeDate }} diff --git a/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee b/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee index 33a4bf495e..bf5a6af511 100644 --- a/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee +++ b/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee @@ -302,17 +302,19 @@ define [ $timeout($scope.init, 100) $scope.create = () -> - project = $scope.data.selectedProjectId + projectId = $scope.data.selectedProjectId + projectDisplayName = _.find($scope.data.projects, (p) -> p._id == projectId).name path = $scope.data.selectedProjectEntity name = $scope.data.name - if !name || !path || !project + if !name || !path || !projectId || !projectDisplayName $scope._reset(err: true) return $scope._setInFlight('create') ide.fileTreeManager .createLinkedFile(name, parent_folder, 'project_file', { - source_project_id: project, - source_entity_path: path + source_project_id: projectId, + source_entity_path: path, + source_project_display_name: projectDisplayName }) .then () -> $scope._reset(err: false)