Skip to content

Commit 95d2b7f

Browse files
author
Sanjeev Papnoi
committed
Merge remote-tracking branch 'origin/1.0' into HEAD
2 parents 3ff5423 + fa0390b commit 95d2b7f

8 files changed

Lines changed: 122 additions & 49 deletions

File tree

‎Controller/Automations/PreparedResponse.php‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33
namespace Webkul\UVDesk\AutomationBundle\Controller\Automations;
44

55
use Doctrine\Common\Collections\Criteria;
6-
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
6+
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
77
use Symfony\Component\HttpFoundation\Request;
88
use Symfony\Component\HttpFoundation\Response;
99
use Symfony\Bundle\FrameworkBundle\Routing\Router;
1010
use Webkul\UVDesk\AutomationBundle\Form\DefaultForm;
1111
use Webkul\UVDesk\AutomationBundle\Entity;
1212
use Symfony\Component\Security\Core\SecurityContextInterface;
13+
use Webkul\UVDesk\CoreFrameworkBundle\Services\UserService;
14+
use Symfony\Component\Translation\TranslatorInterface;
1315

14-
15-
class PreparedResponse extends Controller
16+
class PreparedResponse extends AbstractController
1617
{
1718
const ROLE_REQUIRED_MANUAL = 'ROLE_AGENT_MANAGE_WORKFLOW_MANUAL';
1819
const LIMIT = 20;
@@ -21,9 +22,18 @@ class PreparedResponse extends Controller
2122
const NAME_LENGTH = 100;
2223
const DESCRIPTION_LENGTH = 200;
2324

25+
private $userService;
26+
private $translator;
27+
28+
public function __construct(UserService $userService, TranslatorInterface $translator)
29+
{
30+
$this->userService = $userService;
31+
$this->translator = $translator;
32+
}
33+
2434
public function prepareResponseList(Request $request)
2535
{
26-
if (!$this->get('user.service')->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_MANUAL')) {
36+
if (!$this->userService->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_MANUAL')) {
2737
return $this->redirect($this->generateUrl('helpdesk_member_dashboard'));
2838
}
2939

@@ -32,7 +42,7 @@ public function prepareResponseList(Request $request)
3242

3343
public function createPrepareResponse(Request $request)
3444
{
35-
if (!$this->get('user.service')->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_MANUAL')) {
45+
if (!$this->userService->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_MANUAL')) {
3646
return $this->redirect($this->generateUrl('helpdesk_member_dashboard'));
3747
}
3848

@@ -85,7 +95,7 @@ public function createPrepareResponse(Request $request)
8595
}
8696
}
8797

88-
if ($this->get('user.service')->isAccessAuthorized('ROLE_ADMIN')) {
98+
if ($this->userService->isAccessAuthorized('ROLE_ADMIN')) {
8999
/* groups */
90100
$groups = explode(',', $request->request->get('tempGroups'));
91101
$previousGroupIds = [];
@@ -135,12 +145,12 @@ public function createPrepareResponse(Request $request)
135145
$newWorkflow->setDescription($formData->get('description'));
136146
$newWorkflow->setStatus($formData->get('status') == 'on' ? true : false);
137147

138-
$userData = $this->get('user.service')->getUserDetailById($this->getUser()->getId());
148+
$userData = $this->userService->getUserDetailById($this->getUser()->getId());
139149
if (!$newWorkflow->getUser()) {
140150
$newWorkflow->setUser($userData);
141151
}
142152

143-
if($newWorkflow->getUser()->getId() == $userData->getId() || $this->get('user.service')->isAccessAuthorized('ROLE_ADMIN')) {
153+
if($newWorkflow->getUser()->getId() == $userData->getId() || $this->userService->isAccessAuthorized('ROLE_ADMIN')) {
144154
$newWorkflow->setActions($workflowActionsArray);
145155
}
146156

@@ -149,8 +159,8 @@ public function createPrepareResponse(Request $request)
149159
$entityManager->flush();
150160

151161
$this->addFlash('success', $request->attributes->get('id')
152-
? $this->get('translator')->trans('Success! Prepared Response has been updated successfully.')
153-
: $this->get('translator')->trans('Success! Prepared Response has been added successfully.')
162+
? $this->translator->trans('Success! Prepared Response has been updated successfully.')
163+
: $this->translator->trans('Success! Prepared Response has been added successfully.')
154164
);
155165

156166
return $this->redirectToRoute('prepare_response_action');
@@ -178,7 +188,7 @@ public function createPrepareResponse(Request $request)
178188

179189
public function editPrepareResponse(Request $request)
180190
{
181-
if (!$this->get('user.service')->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_MANUAL')) {
191+
if (!$this->userService->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_MANUAL')) {
182192
return $this->redirect($this->generateUrl('helpdesk_member_dashboard'));
183193
}
184194

@@ -255,7 +265,7 @@ public function editPrepareResponse(Request $request)
255265
}
256266
}
257267

258-
if ($this->get('user.service')->isAccessAuthorized('ROLE_ADMIN')) {
268+
if ($this->userService->isAccessAuthorized('ROLE_ADMIN')) {
259269
/* groups */
260270
$groups = explode(',', $request->request->get('tempGroups'));
261271
$previousGroupIds = [];
@@ -305,12 +315,12 @@ public function editPrepareResponse(Request $request)
305315
$newWorkflow->setDescription($formData->get('description'));
306316
$newWorkflow->setStatus($formData->get('status') == 'on' ? true : false);
307317

308-
$userData = $this->get('user.service')->getUserDetailById($this->getUser()->getId());
318+
$userData = $this->userService->getUserDetailById($this->getUser()->getId());
309319
if (!$newWorkflow->getUser()) {
310320
$newWorkflow->setUser($userData);
311321
}
312322

313-
if ($newWorkflow->getUser()->getId() == $userData->getId() || $this->get('user.service')->isAccessAuthorized('ROLE_ADMIN')) {
323+
if ($newWorkflow->getUser()->getId() == $userData->getId() || $this->userService->isAccessAuthorized('ROLE_ADMIN')) {
314324
$newWorkflow->setActions($workflowActionsArray);
315325
}
316326

@@ -319,8 +329,8 @@ public function editPrepareResponse(Request $request)
319329
$entityManager->flush();
320330

321331
$this->addFlash('success', $request->attributes->get('id')
322-
? $this->get('translator')->trans('Success! Prepared Response has been updated successfully.')
323-
: $this->get('translator')->trans('Success! Prepared Response has been added successfully.')
332+
? $this->translator->trans('Success! Prepared Response has been updated successfully.')
333+
: $this->translator->trans('Success! Prepared Response has been added successfully.')
324334
);
325335

326336
return $this->redirectToRoute('prepare_response_action');

‎Controller/Automations/PreparedResponseXHR.php‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
use Webkul\UVDesk\AutomationBundle\Form;
1111
use Webkul\UVDesk\AutomationBundle\Entity;
1212
use Symfony\Component\Security\Core\SecurityContextInterface;
13-
13+
use Webkul\UVDesk\CoreFrameworkBundle\Services\UserService;
14+
use Symfony\Component\Translation\TranslatorInterface;
15+
use Webkul\UVDesk\AutomationBundle\EventListener\PreparedResponseListener;
1416

1517
class PreparedResponseXHR extends Controller
1618
{
@@ -21,9 +23,20 @@ class PreparedResponseXHR extends Controller
2123
const NAME_LENGTH = 100;
2224
const DESCRIPTION_LENGTH = 200;
2325

26+
private $userService;
27+
private $translator;
28+
private $preparedResponseListner;
29+
30+
public function __construct(UserService $userService, PreparedResponseListener $preparedResponseListner ,TranslatorInterface $translator)
31+
{
32+
$this->userService = $userService;
33+
$this->translator = $translator;
34+
$this->preparedResponseListner = $preparedResponseListner;
35+
}
36+
2437
public function prepareResponseListXhr(Request $request)
2538
{
26-
if (!$this->get('user.service')->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_MANUAL')) {
39+
if (!$this->userService->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_MANUAL')) {
2740
return $this->redirect($this->generateUrl('helpdesk_member_dashboard'));
2841
}
2942

@@ -37,7 +50,7 @@ public function prepareResponseListXhr(Request $request)
3750

3851
public function prepareResponseDeleteXhr(Request $request)
3952
{
40-
if (!$this->get('user.service')->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_MANUAL')) {
53+
if (!$this->userService->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_MANUAL')) {
4154
return $this->redirect($this->generateUrl('helpdesk_member_dashboard'));
4255
}
4356

@@ -51,7 +64,7 @@ public function prepareResponseDeleteXhr(Request $request)
5164
$em->flush();
5265

5366
$json['alertClass'] = 'success';
54-
$json['alertMessage'] = $this->get('translator')->trans('Success ! Prepared response removed successfully.');
67+
$json['alertMessage'] = $this->translator->trans('Success ! Prepared response removed successfully.');
5568
}
5669

5770
$response = new Response(json_encode($json));
@@ -61,7 +74,7 @@ public function prepareResponseDeleteXhr(Request $request)
6174

6275
public function getPreparedResponseActionOptionsXHR($entity, Request $request)
6376
{
64-
foreach ($this->get('uvdesk.automations.prepared_responses')->getRegisteredPreparedResponseActions() as $preparedResponseAction) {
77+
foreach ($this->preparedResponseListner->getRegisteredPreparedResponseActions() as $preparedResponseAction) {
6578
if ($preparedResponseAction->getId() == $entity) {
6679
$options = $preparedResponseAction->getOptions($this->container);
6780

‎Controller/Automations/Workflow.php‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44

55
use Symfony\Component\HttpFoundation\Request;
66
use Symfony\Component\HttpFoundation\Response;
7-
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
7+
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
88
use Webkul\UVDesk\AutomationBundle\Form\DefaultForm;
99
use Webkul\UVDesk\AutomationBundle\Entity;
10+
use Webkul\UVDesk\CoreFrameworkBundle\Services\UserService;
11+
use Webkul\UVDesk\AutomationBundle\EventListener\WorkflowListener;
12+
use Symfony\Component\Translation\TranslatorInterface;
1013

11-
class Workflow extends Controller
14+
class Workflow extends AbstractController
1215
{
1316

1417
const ROLE_REQUIRED_AUTO = 'ROLE_AGENT_MANAGE_WORKFLOW_AUTOMATIC';
@@ -19,9 +22,20 @@ class Workflow extends Controller
1922
const NAME_LENGTH = 100;
2023
const DESCRIPTION_LENGTH = 200;
2124

25+
private $userService;
26+
private $translator;
27+
private $workflowListnerService;
28+
29+
public function __construct(UserService $userService, WorkflowListener $workflowListnerService,TranslatorInterface $translator)
30+
{
31+
$this->userService = $userService;
32+
$this->workflowListnerService = $workflowListnerService;
33+
$this->translator = $translator;
34+
}
35+
2236
public function listWorkflowCollection(Request $request)
2337
{
24-
if (!$this->get('user.service')->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_AUTOMATIC')) {
38+
if (!$this->userService->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_AUTOMATIC')) {
2539
return $this->redirect($this->generateUrl('helpdesk_member_dashboard'));
2640
}
2741

@@ -31,7 +45,7 @@ public function listWorkflowCollection(Request $request)
3145
// Creating workflow
3246
public function createWorkflow(Request $request)
3347
{
34-
if (!$this->get('user.service')->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_AUTOMATIC')) {
48+
if (!$this->userService->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_AUTOMATIC')) {
3549
return $this->redirect($this->generateUrl('helpdesk_member_dashboard'));
3650
}
3751

@@ -138,8 +152,8 @@ public function createWorkflow(Request $request)
138152
}
139153

140154
$this->addFlash('success', $request->attributes->get('id')
141-
? $this->get('translator')->trans('Success! Workflow has been updated successfully.')
142-
: $this->get('translator')->trans('Success! Workflow has been added successfully.')
155+
? $this->translator->trans('Success! Workflow has been updated successfully.')
156+
: $this->translator->trans('Success! Workflow has been added successfully.')
143157
);
144158

145159
return $this->redirectToRoute('helpdesk_member_workflow_collection');
@@ -166,7 +180,7 @@ public function createWorkflow(Request $request)
166180

167181
public function editWorkflow(Request $request)
168182
{
169-
if (!$this->get('user.service')->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_AUTOMATIC')) {
183+
if (!$this->userService->isAccessAuthorized('ROLE_AGENT_MANAGE_WORKFLOW_AUTOMATIC')) {
170184
return $this->redirect($this->generateUrl('helpdesk_member_dashboard'));
171185
}
172186

@@ -188,7 +202,7 @@ public function editWorkflow(Request $request)
188202
];
189203

190204
foreach ($workflow->getWorkflowEvents() as $event) {
191-
$eventDefinition = $this->get('uvdesk.automations.workflows')->getRegisteredWorkflowEvent($event->getEvent());
205+
$eventDefinition = $this->workflowListnerService->getRegisteredWorkflowEvent($event->getEvent());
192206

193207
if (!empty($eventDefinition)) {
194208
$formData['events'][] = [
@@ -323,15 +337,15 @@ public function editWorkflow(Request $request)
323337
}
324338

325339
$this->addFlash('success', $request->attributes->get('id')
326-
? $this->get('translator')->trans('Success! Workflow has been updated successfully.')
327-
: $this->get('translator')->trans('Success! Workflow has been added successfully.')
340+
? $this->translator->trans('Success! Workflow has been updated successfully.')
341+
: $this->translator->trans('Success! Workflow has been added successfully.')
328342
);
329343

330344
return $this->redirectToRoute('helpdesk_member_workflow_collection');
331345
} else {
332346
if (!empty($error['events'])) {
333347
foreach ($error['events'] as $message) {
334-
$this->addFlash('warning', $this->get('translator')->trans("Events: " . $message));
348+
$this->addFlash('warning', $this->translator->trans("Events: " . $message));
335349
}
336350
}
337351
}
@@ -362,6 +376,6 @@ public function deleteWorkflow(Request $request)
362376
}
363377
public function translate($string,$params = array())
364378
{
365-
return $this->get('translator')->trans($string,$params);
379+
return $this->translator->trans($string,$params);
366380
}
367381
}

0 commit comments

Comments
 (0)