From dddfbef61916b997a89eca98ed4365ccee98b7dd Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Tue, 27 Feb 2018 06:28:31 +0800
Subject: [PATCH] Fix fulfillment table bug #14

---
 src/Controller/JobOrderController.php | 4 +++-
 templates/job-order/list.html.twig    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index 99e4710f..e0451b4d 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -294,6 +294,7 @@ class JobOrderController extends BaseController
                 $tier_name = 'Fullfillment';
                 $rows_route = 'jo_fulfill_rows';
                 $edit_route = 'jo_fulfill_form';
+                $unlock_route = '';
                 $jo_status = [
                     JOStatus::ASSIGNED,
                     JOStatus::IN_PROGRESS
@@ -439,7 +440,8 @@ class JobOrderController extends BaseController
 
             // add crud urls
             $row['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $row['id']]);
-            $row['meta']['unlock_url'] = $this->generateUrl($tier_params['unlock_route'], ['id' => $row['id']]);
+            if ($tier_params['unlock_route'] != '')
+                $row['meta']['unlock_url'] = $this->generateUrl($tier_params['unlock_route'], ['id' => $row['id']]);
 
             $rows[] = $row;
         }
diff --git a/templates/job-order/list.html.twig b/templates/job-order/list.html.twig
index 53ee5aef..114d45f0 100644
--- a/templates/job-order/list.html.twig
+++ b/templates/job-order/list.html.twig
@@ -106,7 +106,7 @@
 						template: function (row, index, datatable) {
 							var actions = '<a href="' + row.meta.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="View / Edit"><i class="la la-edit"></i></a>';
 
-                            {% if is_granted('jo_proc.unlock') %}
+                            {% if row.meta.unlock_url != "" && is_granted('jo_proc.unlock') %}
 							actions += '<a href="' + row.meta.unlock_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="Unlock"><i class="fa fa-unlock"></i></a>';
                             {% endif %}