From 8aef911b7af30558b043e64d20d8d11e776233e7 Mon Sep 17 00:00:00 2001 From: Shraddha Kulkarni Date: Tue, 13 Feb 2024 13:26:20 +0000 Subject: [PATCH] bugfixes --- app/User.php | 2 +- resources/views/classic/collection.blade.php | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/User.php b/app/User.php index 09a77fb7..c26bfb9b 100644 --- a/app/User.php +++ b/app/User.php @@ -146,7 +146,7 @@ public function canApproveDocument($document_id, $user_role=null){ if($this->hasPermission($collection_id, 'MAINTAINER') || //($this->hasPermission($collection_id, 'APPROVE') && $document->created_by == $this->id) || - ($approval_roles && in_array($user_role,$approval_roles->approved_by))){ + ($collection_details->require_approval && $approval_roles && in_array($user_role,$approval_roles->approved_by))){ return true; } return false; diff --git a/resources/views/classic/collection.blade.php b/resources/views/classic/collection.blade.php index cff848b5..c367986a 100644 --- a/resources/views/classic/collection.blade.php +++ b/resources/views/classic/collection.blade.php @@ -119,9 +119,14 @@ function goToPage(page){ @php // get reverse meta field values - $rmf_values = App\ReverseMetaFieldValue::whereHas('document', function($q){ - $q->whereNotNull('approved_on'); - })->get(); + if($collection->require_approval){ + $rmf_values = App\ReverseMetaFieldValue::whereHas('document', function($q){ + $q->whereNotNull('approved_on'); + })->get(); + } + else{ + $rmf_values = App\ReverseMetaFieldValue::all(); + } $rmfv_map = []; foreach($rmf_values as $rmfv){ $mf = \App\MetaField::where('id', $rmfv->meta_field_id)->first();