rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '77-uat-bug-fixing' into 'master'

Browse source 
Resolve "UAT Bug fixing"

Closes #77

See merge request jankstudio/resq!64
This commit is contained in:
Kendrick Chan 2018-04-06 09:50:59 +00:00
commit 13ba67700f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Controller/CustomerController.php
View file

@ -128,9 +128,9 @@ class CustomerController extends BaseController
]; ];
// add crud urls // add crud urls
if ($this->isGranted('user.update')) if ($this->isGranted('customer.update'))
$row['meta']['update_url'] = $this->generateUrl('customer_update', ['id' => $row['id']]); $row['meta']['update_url'] = $this->generateUrl('customer_update', ['id' => $row['id']]);
if ($this->isGranted('user.delete')) if ($this->isGranted('customer.delete'))
$row['meta']['delete_url'] = $this->generateUrl('customer_delete', ['id' => $row['id']]); $row['meta']['delete_url'] = $this->generateUrl('customer_delete', ['id' => $row['id']]);
$rows[] = $row; $rows[] = $row;

2
templates/ticket/form.html.twig
View file

@ -114,7 +114,7 @@
<div class="col-lg-4"> <div class="col-lg-4">
<label>&nbsp;</label> <label>&nbsp;</label>
<div> <div>
<a href="{{ url('jo_proc_form', {'id': job_order.getID }) }}" class="btn btn-info">View Job Order</a> <a href="{{ url('jo_all_form', {'id': job_order.getID }) }}" class="btn btn-info">View Job Order</a>
</div> </div>
</div> </div>
{% endif %} {% endif %}