From 5e6f3a97a5e2ced4eba4b3fc15c9fc549edcd5dd Mon Sep 17 00:00:00 2001
From: usmannasir <01-134132-158@student.bahria.edu.pk>
Date: Tue, 12 Feb 2019 01:57:35 +0500
Subject: [PATCH] bug fix to filemanager (change permissions)

---
 filemanager/filemanager.py                    | 22 +++++++++++++++++++
 .../static/filemanager/js/fileManager.js      |  2 +-
 filemanager/views.py                          |  2 ++
 static/filemanager/js/fileManager.js          |  2 +-
 .../websiteFunctions/installWordPress.html    |  2 +-
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/filemanager/filemanager.py b/filemanager/filemanager.py
index 4712348b2..afb122ece 100644
--- a/filemanager/filemanager.py
+++ b/filemanager/filemanager.py
@@ -317,5 +317,27 @@ class FileManager:
             json_data = json.dumps(finalData)
             return HttpResponse(json_data)
 
+        except BaseException, msg:
+            return self.ajaxPre(0, str(msg))
+
+    def changePermissions(self):
+        try:
+
+            finalData = {}
+            finalData['status'] = 1
+
+            if self.data['recursive'] == 1:
+                command = 'sudo chmod -R ' + self.data['newPermissions'] + ' ' + self.returnPathEnclosed(
+                    self.data['basePath'] + '/' + self.data['permissionsPath'])
+            else:
+                command = 'sudo chmod ' + self.data['newPermissions'] + ' ' + self.returnPathEnclosed(
+                    self.data['basePath'] + '/' + self.data['permissionsPath'])
+
+
+            ProcessUtilities.executioner(command)
+
+            json_data = json.dumps(finalData)
+            return HttpResponse(json_data)
+
         except BaseException, msg:
             return self.ajaxPre(0, str(msg))
\ No newline at end of file
diff --git a/filemanager/static/filemanager/js/fileManager.js b/filemanager/static/filemanager/js/fileManager.js
index 82e9410b7..a76ebcb04 100644
--- a/filemanager/static/filemanager/js/fileManager.js
+++ b/filemanager/static/filemanager/js/fileManager.js
@@ -1551,7 +1551,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
             $scope.changePermissionsLoading = true;
             $('#showPermissions').modal('hide');
 
-            if (response.data.permissionsChanged === 1) {
+            if (response.data.status === 1) {
                 var notification = alertify.notify('Permissions Successfully Changed!', 'success', 5, function () {
                 });
                 $scope.fetchForTableSecondary(null, 'refresh');
diff --git a/filemanager/views.py b/filemanager/views.py
index ce1129888..b9cfae2ea 100644
--- a/filemanager/views.py
+++ b/filemanager/views.py
@@ -135,6 +135,8 @@ def controller(request):
             return fm.extract()
         elif method == 'compress':
             return fm.compress()
+        elif method == 'changePermissions':
+            return fm.changePermissions()
 
 
     except BaseException, msg:
diff --git a/static/filemanager/js/fileManager.js b/static/filemanager/js/fileManager.js
index 82e9410b7..a76ebcb04 100644
--- a/static/filemanager/js/fileManager.js
+++ b/static/filemanager/js/fileManager.js
@@ -1551,7 +1551,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
             $scope.changePermissionsLoading = true;
             $('#showPermissions').modal('hide');
 
-            if (response.data.permissionsChanged === 1) {
+            if (response.data.status === 1) {
                 var notification = alertify.notify('Permissions Successfully Changed!', 'success', 5, function () {
                 });
                 $scope.fetchForTableSecondary(null, 'refresh');
diff --git a/websiteFunctions/templates/websiteFunctions/installWordPress.html b/websiteFunctions/templates/websiteFunctions/installWordPress.html
index 30150819e..2800f2628 100644
--- a/websiteFunctions/templates/websiteFunctions/installWordPress.html
+++ b/websiteFunctions/templates/websiteFunctions/installWordPress.html
@@ -55,7 +55,7 @@
                 <div ng-hide="installationDetailsForm" class="form-group">
                     <label class="col-sm-3 control-label">{% trans "Path" %}</label>
                     <div class="col-sm-6">
-                        <input placeholder="Leave emtpy to install in website home directory. (Without preceding slash)"  type="text" class="form-control" ng-model="installPath">
+                        <input placeholder="Leave empty to install in website home directory. (Without preceding slash)"  type="text" class="form-control" ng-model="installPath">
                     </div>
                 </div>