From 883ac5d90f151d0bfcd0935186b6cb1440e24841 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Thu, 3 Jul 2025 13:08:48 +0800
Subject: [PATCH] Dont render delete button on Entries that have subordinates

---
 app/Classes/LDAP/Attribute.php          |  2 ++
 app/Http/Controllers/HomeController.php |  2 +-
 resources/views/frames/dn.blade.php     | 11 +++++------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/Classes/LDAP/Attribute.php b/app/Classes/LDAP/Attribute.php
index b76239c3..79f4592d 100644
--- a/app/Classes/LDAP/Attribute.php
+++ b/app/Classes/LDAP/Attribute.php
@@ -172,6 +172,8 @@ class Attribute implements \Countable, \ArrayAccess
 			'required_by' => $this->schema?->required_by_object_classes ?: collect(),
 			// Used in Object Classes
 			'used_in' => $this->schema?->used_in_object_classes ?: collect(),
+			// For single value attributes
+			'value' => $this->schema?->is_single_value ? $this->values->first() : NULL,
 			// The current attribute values
 			'values' => ($this->no_attr_tags || $this->is_internal) ? $this->tagValues() : $this->_values,
 			// The original attribute values
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 1751992d..cee922c6 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -412,7 +412,7 @@ class HomeController extends Controller
 				->with('page_actions',collect([
 					'copy'=>FALSE,
 					'create'=>($x=($o->getObjects()->except('entryuuid')->count() > 0)),
-					'delete'=>$x,
+					'delete'=>(! is_null($xx=$o->getObject('hassubordinates')->value)) && ($xx === 'FALSE'),
 					'edit'=>$x,
 					'export'=>$x,
 				])),
diff --git a/resources/views/frames/dn.blade.php b/resources/views/frames/dn.blade.php
index 5cc830ba..32ed708d 100644
--- a/resources/views/frames/dn.blade.php
+++ b/resources/views/frames/dn.blade.php
@@ -9,30 +9,29 @@
 		<div class="col">
 			<div class="action-buttons float-end">
 				<ul class="nav">
-					@if(isset($page_actions) && $page_actions->get('create'))
+					@if($page_actions->get('create'))
 						<li>
 							<button class="btn btn-outline-dark p-1 m-1" id="entry-create" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Create Child Entry')"><i class="fas fa-fw fa-diagram-project fs-5"></i></button>
 						</li>
 					@endif
-					@if(isset($page_actions) && $page_actions->get('export'))
+					@if($page_actions->get('export'))
 						<li>
 							<span id="entry-export" data-bs-toggle="modal" data-bs-target="#page-modal">
 								<button class="btn btn-outline-dark p-1 m-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Export')"><i class="fas fa-fw fa-download fs-5"></i></button>
 							</span>
 						</li>
 					@endif
-					@if(isset($page_actions) && $page_actions->get('copy'))
+					@if($page_actions->get('copy'))
 						<li>
 							<button class="btn btn-outline-dark p-1 m-1" id="entry-copy-move" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Copy/Move')" disabled><i class="fas fa-fw fa-copy fs-5"></i></button>
 						</li>
 					@endif
-					@if(isset($page_actions) && $page_actions->get('edit'))
+					@if($page_actions->get('edit'))
 						<li>
 							<button class="btn btn-outline-dark p-1 m-1" id="entry-edit" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Edit Entry')"><i class="fas fa-fw fa-edit fs-5"></i></button>
 						</li>
 					@endif
-					<!-- @todo Dont offer the delete button for an entry with children -->
-					@if(isset($page_actions) && $page_actions->get('delete'))
+					@if($page_actions->get('delete'))
 						<li>
 							<span id="entry-delete" data-bs-toggle="modal" data-bs-target="#page-modal">
 								<button class="btn btn-outline-danger p-1 m-1" data-bs-custom-class="custom-tooltip-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Delete Entry')"><i class="fas fa-fw fa-trash-can fs-5"></i></button>