Move chown entries into main filemanager controller

src/components/filetree.html

@@ -57,37 +57,6 @@
   </div>
 </div>
 
-<!-- Modal chown entry -->
-<div class="modal fade" id="{{ 'chownEntryModal-' + $id }}" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <!-- TODO remove fileName later once all translations have been updated -->
-        <h4 class="modal-title">{{ 'filemanager.chownDialog.title' | tr:{ fileName: selected[0].fileName } }}</h4>
-      </div>
-      <div class="modal-body">
-        <form role="form" name="chownEntryForm" ng-submit="chownEntry.submit()" autocomplete="off">
-          <div class="form-group" ng-class="{ 'has-error': (chownEntryForm.newOwner.$dirty && chownEntry.error) }">
-            <label class="control-label">{{ 'filemanager.chownDialog.newOwner' | tr }}</label>
-            <div class="control-label" for="inputNewOwner" ng-show="chownEntry.error">{{ chownEntry.error }}</div>
-            <select class="form-control" id="inputNewOwner" name="newOwner" ng-model="chownEntry.newOwner" ng-options="a.value as a.name for a in owners" ng-disabled="chownEntry.busy"></select>
-          </div>
-          <div class="form-group" ng-show="chownEntry.showRecursiveOption">
-            <input type="checkbox" id="inputNewOwnerRecursive" ng-model="chownEntry.recursive">
-            <label class="control-label" for="inputNewOwnerRecursive">{{ 'filemanager.chownDialog.recursiveCheckbox' | tr }}</label>
-          </div>
-          <input class="ng-hide" type="submit" ng-disabled="chownEntryForm.$invalid || chownEntry.busy"/>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
-        <button type="button" class="btn btn-primary" ng-click="chownEntry.submit()" ng-hide="chownEntry.error" ng-disabled="chownEntry.busy"><i class="fa fa-circle-notch fa-spin" ng-show="chownEntry.busy"></i> {{ 'filemanager.chownDialog.change' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-
 <!-- main content -->
 
 <div class="toolbar">

src/components/filetree.js

@@ -12,6 +12,7 @@ angular.module('Application').component('filetree', {
         onUploadFolder: '&',
         onRenameEntry: '&',
         onExtractEntry: '&',
+        onChownEntries: '&',
         onDeleteEntries: '&'
     },
     templateUrl: 'components/filetree.html?<%= revision %>',
@@ -40,13 +41,6 @@ function FileTreeController($scope, $translate, $timeout, Client) {
     // register so parent can call child
     $scope.$parent.registerChild($scope);
 
-    $scope.owners = [
-        { name: 'cloudron', value: 1000 },
-        { name: 'www-data', value: 33 },
-        { name: 'git', value: 1001 },
-        { name: 'root', value: 0 }
-    ];
-
     function isArchive(f) {
         return f.match(/\.tgz$/)        ||
                f.match(/\.tar$/)        ||
@@ -582,43 +576,6 @@ function FileTreeController($scope, $translate, $timeout, Client) {
         }
     };
 
-    $scope.chownEntry = {
-        busy: false,
-        error: null,
-        newOwner: 0,
-        recursive: false,
-        showRecursiveOption: false,
-
-        show: function () {
-            $scope.chownEntry.error = null;
-            // set default uid from first file
-            $scope.chownEntry.newOwner = $scope.selected[0].uid;
-            $scope.chownEntry.busy = false;
-
-            // default for directories is recursive
-            $scope.chownEntry.recursive = !!$scope.selected.find(function (entry) { return entry.isDirectory; });
-            $scope.chownEntry.showRecursiveOption = !!$scope.chownEntry.recursive;
-
-            $('#chownEntryModal-' + $scope.$id).modal('show');
-        },
-
-        submit: function () {
-            $scope.chownEntry.busy = true;
-
-            async.eachLimit($scope.selected, 5, function (entry, callback) {
-                var filePath = sanitize($scope.cwd + '/' + entry.fileName);
-
-                Client.filesChown($scope.backendId, $scope.backendType, filePath, $scope.chownEntry.newOwner, $scope.chownEntry.recursive, callback);
-            }, function (error) {
-                $scope.chownEntry.busy = false;
-                if (error) return Client.error(error);
-
-                $scope.refresh();
-
-                $('#chownEntryModal-' + $scope.$id).modal('hide');
-            });
-        }
-    };
 
     $scope.newFile = {
         busy: false,
@@ -679,7 +636,7 @@ function FileTreeController($scope, $translate, $timeout, Client) {
                 click: function ($itemScope, $event, entry) { ctrl.onRenameEntry({ cwd: $scope.cwd, entry: entry }); }
             }, {
                 text: tr['filemanager.list.menu.chown'],
-                click: function ($itemScope, $event, entry) { $scope.chownEntry.show(); }
+                click: function ($itemScope, $event, entry) { ctrl.onChownEntries({ cwd: $scope.cwd, entries: $scope.selected }); }
             }, {
                 text: tr['filemanager.list.menu.extract'],
                 displayed: function ($itemScope, $event, entry) { return !entry.isDirectory && isArchive(entry.fileName); },

src/filemanager.html

@@ -81,8 +81,7 @@
       <div class="modal-content">
         <div class="modal-body">
           <p class="text-bold text-danger" ng-show="deleteEntries.error">{{ deleteEntries.error }}</p>
-          <!-- TODO remove fileName later once all translations have been updated -->
-          <h4 ng-hide="deleteEntries.error">{{ 'filemanager.removeDialog.reallyDelete' | tr:{ fileName: deleteEntries.entries[0].fileName } }}</h4>
+          <h4 ng-hide="deleteEntries.error">{{ 'filemanager.removeDialog.reallyDelete' | tr }}</h4>
           <ul>
             <li ng-repeat="entry in deleteEntries.entries">{{ entry.fileName }}</li>
           </ul>
@@ -145,6 +144,35 @@
     </div>
   </div>
 
+  <!-- Modal chown entry -->
+  <div class="modal fade" id="chownEntriesModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">{{ 'filemanager.chownDialog.title' | tr }}</h4>
+        </div>
+        <div class="modal-body">
+          <form role="form" name="chownEntryForm" ng-submit="chownEntries.submit()" autocomplete="off">
+            <div class="form-group" ng-class="{ 'has-error': (chownEntryForm.newOwner.$dirty && chownEntries.error) }">
+              <label class="control-label">{{ 'filemanager.chownDialog.newOwner' | tr }}</label>
+              <div class="control-label" for="inputNewOwner" ng-show="chownEntries.error">{{ chownEntries.error }}</div>
+              <select class="form-control" id="inputNewOwner" name="newOwner" ng-model="chownEntries.newOwner" ng-options="a.value as a.name for a in OWNERS" ng-disabled="chownEntries.busy"></select>
+            </div>
+            <div class="form-group" ng-show="chownEntries.showRecursiveOption">
+              <input type="checkbox" id="inputNewOwnerRecursive" ng-model="chownEntries.recursive">
+              <label class="control-label" for="inputNewOwnerRecursive">{{ 'filemanager.chownDialog.recursiveCheckbox' | tr }}</label>
+            </div>
+            <input class="ng-hide" type="submit" ng-disabled="chownEntryForm.$invalid || chownEntries.busy"/>
+          </form>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
+          <button type="button" class="btn btn-primary" ng-click="chownEntries.submit()" ng-hide="chownEntries.error" ng-disabled="chownEntries.busy"><i class="fa fa-circle-notch fa-spin" ng-show="chownEntries.busy"></i> {{ 'filemanager.chownDialog.change' | tr }}</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <!-- Modal editor close -->
   <div class="modal fade" id="textEditorCloseModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
@@ -230,17 +258,18 @@
           on-delete-entries="deleteEntries.show(cwd, entries)"
           on-rename-entry="renameEntry.show(cwd, entry)"
           on-extract-entry="extractEntry(cwd, entry)"
+          on-chown-entries="chownEntries.show(cwd, entries)"
           backend-type="backendType" backend-id="backendId" view="VIEW.LEFT"
           ng-click="setActiveView(VIEW.LEFT)"></filetree>
-        <!-- <div class="spacer" ng-show="splitView"></div> -->
-        <filetree class="two-pane"
+        <filetree ng-show="splitView" class="two-pane"
           on-upload-folder="onUploadFolder(cwd)"
           on-upload-file="onUploadFile(cwd)"
           on-delete-entries="deleteEntries.show(cwd, entries)"
           on-rename-entry="renameEntry.show(cwd, entry)"
           on-extract-entry="extractEntry(cwd, entry)"
+          on-chown-entries="chownEntries.show(cwd, entries)"
           backend-type="backendType" backend-id="backendId" view="VIEW.RIGHT"
-          ng-click="setActiveView(VIEW.RIGHT)" ng-show="splitView"></filetree>
+          ng-click="setActiveView(VIEW.RIGHT)"></filetree>
       </div>
 
     </div>

src/js/filemanager.js

@@ -79,11 +79,19 @@ var VIEW = {
     RIGHT: 'right'
 };
 
+var OWNERS = [
+    { name: 'cloudron', value: 1000 },
+    { name: 'www-data', value: 33 },
+    { name: 'git', value: 1001 },
+    { name: 'root', value: 0 }
+];
+
 app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Client', function ($scope, $translate, $timeout, Client) {
     var search = decodeURIComponent(window.location.search).slice(1).split('&').map(function (item) { return item.split('='); }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {});
 
     // expose enums
     $scope.VIEW = VIEW;
+    $scope.OWNERS = OWNERS;
 
     $scope.initialized = false;
     $scope.status = null;
@@ -290,6 +298,49 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
     };
 
 
+    // chown entries
+
+    $scope.chownEntries = {
+        busy: false,
+        error: null,
+        entries: [],
+        newOwner: 0,
+        recursive: false,
+        showRecursiveOption: false,
+
+        show: function (cwd, entries) {
+            $scope.chownEntries.error = null;
+            $scope.chownEntries.cwd = cwd;
+            $scope.chownEntries.entries = entries;
+            // set default uid from first file
+            $scope.chownEntries.newOwner = entries[0].uid;
+            $scope.chownEntries.busy = false;
+
+            // default for directories is recursive
+            $scope.chownEntries.recursive = !!entries.find(function (entry) { return entry.isDirectory; });
+            $scope.chownEntries.showRecursiveOption = false;
+
+            $('#chownEntriesModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.chownEntries.busy = true;
+
+            async.eachLimit($scope.chownEntries.entries, 5, function (entry, callback) {
+                var filePath = sanitize($scope.chownEntries.cwd + '/' + entry.fileName);
+
+                Client.filesChown($scope.backendId, $scope.backendType, filePath, $scope.chownEntries.newOwner, $scope.chownEntries.recursive, callback);
+            }, function (error) {
+                $scope.chownEntries.busy = false;
+                if (error) return Client.error(error);
+
+                $scope.refresh();
+
+                $('#chownEntriesModal').modal('hide');
+            });
+        }
+    };
+
     // extract archives
 
     $scope.extractStatus = {