jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

entry.filePath -> entry.fileName

Browse Source
This commit is contained in:
Johannes Zellner
2020-07-09 16:26:23 +02:00
parent 049a488e08
commit 805e07e65f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/filemanager.html
+2 -2
View File
@@ -104,7 +104,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Rename {{ renameEntry.entry.filePath }}</h4>
<h4 class="modal-title">Rename {{ renameEntry.entry.fileName }}</h4>
</div>
<div class="modal-body">
<form role="form" name="renameEntryForm" ng-submit="renameEntry.submit()" autocomplete="off">
@@ -172,7 +172,7 @@
<i class="fas fa-folder" ng-show="entry.isDirectory"></i>
<i class="far fa-file" ng-show="entry.isFile"></i>
</td>
<td class="hand elide-table-cell" ng-click="open(entry)">{{ entry.filePath }}</td>
<td class="hand elide-table-cell" ng-click="open(entry)">{{ entry.fileName }}</td>
<td class="hand elide-table-cell" ng-click="open(entry)">{{ entry.size | prettyDiskSize }}</td>
<td class="hand elide-table-cell" ng-click="open(entry)">{{ entry.uid | prettyOwner }}</td>
<td class="text-right no-wrap" style="vertical-align: bottom">
src/js/filemanager.js
+4 -4
View File
@@ -56,7 +56,7 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
};
$scope.open = function (entry) {
var filePath = sanitize($scope.cwd + '/' + entry.filePath);
var filePath = sanitize($scope.cwd + '/' + entry.fileName);
if (entry.isDirectory) {
setDirectory(filePath);
@@ -170,7 +170,7 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
show: function (entry) {
$scope.renameEntry.error = null;
$scope.renameEntry.entry = entry;
$scope.renameEntry.newName = entry.filePath;
$scope.renameEntry.newName = entry.fileName;
$scope.renameEntry.busy = false;
$('#renameEntryModal').modal('show');
@@ -179,7 +179,7 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
submit: function () {
$scope.renameEntry.busy = true;
var oldFilePath = sanitize($scope.cwd + '/' + $scope.renameEntry.entry.filePath);
var oldFilePath = sanitize($scope.cwd + '/' + $scope.renameEntry.entry.fileName);
var newFilePath = sanitize($scope.cwd + '/' + $scope.renameEntry.newName);
Client.filesRename($scope.appId, oldFilePath, newFilePath, function (error, result) {
@@ -210,7 +210,7 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
submit: function () {
$scope.entryRemove.busy = true;
var filePath = sanitize($scope.cwd + '/' + $scope.entryRemove.entry.filePath);
var filePath = sanitize($scope.cwd + '/' + $scope.entryRemove.entry.fileName);
Client.filesRemove($scope.appId, filePath, function (error, result) {
$scope.entryRemove.busy = false;