Просмотр исходного кода

Merge pull request #1771 from overleaf/jel-new-file-controller-scope

Pass in missing scope to NewFileModalController

GitOrigin-RevId: 41de974c8ff93bb41d42ef2d17e0c0732ba12ffb
Jessica Lawshe 7 лет назад
Родитель
Сommit
77de78e70b

+ 6 - 0
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
             }
           }
         })

+ 6 - 0
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
           }
         }
       }))