From 6ade9f5f1ce353cb14a78fc733184921ecf7a7b3 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 5 Nov 2017 14:10:51 +0200 Subject: [PATCH] Limit when ip link is shown in activity table --- app/Ninja/Datatables/ActivityDatatable.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/Ninja/Datatables/ActivityDatatable.php b/app/Ninja/Datatables/ActivityDatatable.php index 8b3887659321..6fa614dab252 100644 --- a/app/Ninja/Datatables/ActivityDatatable.php +++ b/app/Ninja/Datatables/ActivityDatatable.php @@ -15,8 +15,17 @@ class ActivityDatatable extends EntityDatatable 'activities.id', function ($model) { $str = Utils::timestampToDateTimeString(strtotime($model->created_at)); + $activityTypes = [ + ACTIVITY_TYPE_VIEW_INVOICE, + ACTIVITY_TYPE_VIEW_QUOTE, + ACTIVITY_TYPE_CREATE_PAYMENT, + ACTIVITY_TYPE_APPROVE_QUOTE, + ]; - if ($model->contact_id && ! in_array($model->ip, ['127.0.0.1', '192.168.255.33'])) { + if ($model->contact_id + && ! $model->is_system + && in_array($model->activity_type_id, $activityTypes) + && ! in_array($model->ip, ['127.0.0.1', '192.168.255.33'])) { $ipLookUpLink = IP_LOOKUP_URL . $model->ip; $str .= sprintf('   ', $model->ip, $ipLookUpLink); }