diff --git a/frontend/src/models/DirectoryModel.js b/frontend/src/models/DirectoryModel.js index 9d37389ef..fbc1e1866 100644 --- a/frontend/src/models/DirectoryModel.js +++ b/frontend/src/models/DirectoryModel.js @@ -4,10 +4,27 @@ import { sanitize } from 'pankow/utils'; const BASE_URL = import.meta.env.BASE_URL || '/'; -export function createDirectoryModel(origin, accessToken, api, ownersModel) { +export function createDirectoryModel(origin, accessToken, api) { + const ownersModel = [{ + uid: 0, + label: 'root' + }, { + uid: 33, + label: 'www-data' + }, { + uid: 808, + label: 'yellowtent' + }, { + uid: 1000, + label: 'cloudron' + }, { + uid: 1001, + label: 'git' + }]; return { name: 'DirectoryModel', + ownersModel, buildFilePath(filePath, fileName) { // remove leading and trailing slashes while (filePath.startsWith('/')) filePath = filePath.slice(1); diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue index 6e8428c85..d77971d72 100644 --- a/frontend/src/views/Home.vue +++ b/frontend/src/views/Home.vue @@ -198,22 +198,7 @@ export default { busy: false, name: '' }, - ownersModel: [{ - uid: 0, - label: 'root' - }, { - uid: 33, - label: 'www-data' - }, { - uid: 808, - label: 'yellowtent' - }, { - uid: 1000, - label: 'cloudron' - }, { - uid: 1001, - label: 'git' - }], + ownersModel: [], // contextMenuModel will have activeItem attached if any command() is called createMenuModel: [{ label: () => this.$t('filemanager.toolbar.newFile'), @@ -553,7 +538,9 @@ export default { this.resourceType = type; this.resourceId = resourceId; - this.directoryModel = createDirectoryModel(this.apiOrigin, this.accessToken, type === 'volume' ? `volumes/${resourceId}` : `apps/${resourceId}`, this.ownersModel); + this.directoryModel = createDirectoryModel(this.apiOrigin, this.accessToken, type === 'volume' ? `volumes/${resourceId}` : `apps/${resourceId}`); + this.ownersModel = this.directoryModel.ownersModel; + this.loadCwd(); this.$watch(() => this.$route.params, (toParams, previousParams) => {