Make user actions available from contextual menu

1 files changed, 11 insertions, 2 deletions

diff --git a/app/Controller/AvatarFileController.php b/app/Controller/AvatarFileController.php
index 2a63c5ae..327080d2 100644
--- a/app/Controller/AvatarFileController.php
+++ b/app/Controller/AvatarFileController.php
@@ -36,7 +36,7 @@ class AvatarFileController extends BaseController
             $this->flash->failure(t('Unable to upload files, check the permissions of your data folder.'));
         }
 
-        $this->response->redirect($this->helper->url->to('AvatarFileController', 'show', array('user_id' => $user['id'])));
+        $this->renderResponse($user['id']);
     }
 
     /**
@@ -48,7 +48,7 @@ class AvatarFileController extends BaseController
         $user = $this->getUser();
         $this->avatarFileModel->remove($user['id']);
         $this->userSession->refresh($user['id']);
-        $this->response->redirect($this->helper->url->to('AvatarFileController', 'show', array('user_id' => $user['id'])));
+        $this->renderResponse($user['id']);
     }
 
     /**
@@ -91,4 +91,13 @@ class AvatarFileController extends BaseController
             $this->logger->error($e->getMessage());
         }
     }
+
+    protected function renderResponse($userId)
+    {
+        if ($this->request->isAjax()) {
+            $this->show();
+        } else {
+            $this->response->redirect($this->helper->url->to('AvatarFileController', 'show', array('user_id' => $userId)));
+        }
+    }
 }