From 77de78e70b76f89537fc00cbdf7c6690f956ba5f Mon Sep 17 00:00:00 2001 From: Jessica Lawshe Date: Tue, 14 May 2019 10:48:45 -0500 Subject: [PATCH] Merge pull request #1771 from overleaf/jel-new-file-controller-scope Pass in missing scope to NewFileModalController GitOrigin-RevId: 41de974c8ff93bb41d42ef2d17e0c0732ba12ffb --- .../src/ide/file-tree/controllers/FileTreeController.js | 6 ++++++ .../ide/file-tree/controllers/FileTreeFolderController.js | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/services/web/public/src/ide/file-tree/controllers/FileTreeController.js b/services/web/public/src/ide/file-tree/controllers/FileTreeController.js index 4e41614ed0..d09dc3b7bf 100644 --- a/services/web/public/src/ide/file-tree/controllers/FileTreeController.js +++ b/services/web/public/src/ide/file-tree/controllers/FileTreeController.js @@ -60,11 +60,17 @@ define(['base'], function(App) { controller: 'NewFileModalController', size: 'lg', resolve: { + projectFeatures() { + return ide.$scope.project.features + }, parent_folder() { return ide.fileTreeManager.getCurrentFolder() }, type() { return 'upload' + }, + userFeatures() { + return ide.$scope.user.features } } }) diff --git a/services/web/public/src/ide/file-tree/controllers/FileTreeFolderController.js b/services/web/public/src/ide/file-tree/controllers/FileTreeFolderController.js index 3c2ccf0e06..4b8397ec9a 100644 --- a/services/web/public/src/ide/file-tree/controllers/FileTreeFolderController.js +++ b/services/web/public/src/ide/file-tree/controllers/FileTreeFolderController.js @@ -99,8 +99,14 @@ define(['base'], App => parent_folder() { return $scope.entity }, + projectFeatures() { + return ide.$scope.project.features + }, type() { return 'upload' + }, + userFeatures() { + return ide.$scope.user.features } } }))