From b22c9505bcb9cf6373f15a9917a81501f62fc109 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Fri, 27 Jun 2025 18:44:25 +1000
Subject: [PATCH] Fix rendering of objectclass in server info, consistent use
 of true/false/null in view blades

---
 .../views/components/attribute/template/select.blade.php  | 2 +-
 resources/views/fragment/template/dn.blade.php            | 2 +-
 resources/views/frames/create.blade.php                   | 8 ++++----
 resources/views/frames/dn.blade.php                       | 4 ++--
 resources/views/frames/info.blade.php                     | 6 +++++-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/resources/views/components/attribute/template/select.blade.php b/resources/views/components/attribute/template/select.blade.php
index efbaffec..fd92fbf1 100644
--- a/resources/views/components/attribute/template/select.blade.php
+++ b/resources/views/components/attribute/template/select.blade.php
@@ -12,7 +12,7 @@
 						:options="$template->attributeOptions($o->name_lc)"
 						allowclear="true"
 						:disabled="! $new"
-						:readonly="FALSE"/>
+						:readonly="false"/>
 
 					<div class="invalid-feedback pb-2">
 						@if($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index))
diff --git a/resources/views/fragment/template/dn.blade.php b/resources/views/fragment/template/dn.blade.php
index 7fe9100d..6492a3c1 100644
--- a/resources/views/fragment/template/dn.blade.php
+++ b/resources/views/fragment/template/dn.blade.php
@@ -9,7 +9,7 @@
 			@php($up=(session()->get('updated') ?: collect()))
 
 			@foreach($o->getVisibleAttributes()->filter(fn($item)=>$template->attributes->keys()->map('strtolower')->contains($item->name_lc)) as $ao)
-				<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :template="$template" :updated="$up->contains($ao->name)"/>
+				<x-attribute-type :o="$ao" :edit="true" :new="false" :template="$template" :updated="$up->contains($ao->name)"/>
 			@endforeach
 		</div>
 	</div>
diff --git a/resources/views/frames/create.blade.php b/resources/views/frames/create.blade.php
index 95289080..35b1db34 100644
--- a/resources/views/frames/create.blade.php
+++ b/resources/views/frames/create.blade.php
@@ -40,7 +40,7 @@
 												->filter(fn($item)=>$item->isStructural())
 												->sortBy(fn($item)=>$item->name_lc)
 												->map(fn($item)=>['id'=>$item->name,'value'=>$item->name])"
-											:allowclear="TRUE"
+											:allowclear="true"
 										/>
 									</div>
 
@@ -55,7 +55,7 @@
 												:label="__('Select a Template').'...'"
 												:options="$o->templates
 													->map(fn($item,$key)=>['id'=>$key,'value'=>$item->title])"
-												:allowclear="TRUE"
+												:allowclear="true"
 											/>
 										</div>
 									@endif
@@ -64,10 +64,10 @@
 
 							@case(2)
 								<input type="hidden" name="_template" value="{{ $template?->file }}">
-								<x-attribute-type :o="$o->getObject('rdn')" :edit="TRUE" :new="TRUE" :template="$template" :updated="FALSE"/>
+								<x-attribute-type :o="$o->getObject('rdn')" :edit="true" :new="true" :template="$template" :updated="false"/>
 
 								@foreach($o->getVisibleAttributes() as $ao)
-									<x-attribute-type :o="$ao" :edit="TRUE" :new="TRUE" :template="$template" :updated="FALSE"/>
+									<x-attribute-type :o="$ao" :edit="true" :new="true" :template="$template" :updated="false"/>
 								@endforeach
 
 								@if(! $template)
diff --git a/resources/views/frames/dn.blade.php b/resources/views/frames/dn.blade.php
index 37dc2053..5cc830ba 100644
--- a/resources/views/frames/dn.blade.php
+++ b/resources/views/frames/dn.blade.php
@@ -101,7 +101,7 @@
 												<div class="tab-content">
 													@php($up=(session()->pull('updated') ?: collect()))
 													@foreach($o->getVisibleAttributes() as $ao)
-														<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :template="NULL" :updated="$up->contains($ao->name)"/>
+														<x-attribute-type :o="$ao" :edit="true" :new="false" :template="null" :updated="$up->contains($ao->name)"/>
 													@endforeach
 
 													@include('fragment.dn.add_attr')
@@ -124,7 +124,7 @@
 					<!-- Internal Attributes -->
 					<div class="tab-pane mt-3" id="internal" role="tabpanel">
 						@foreach($o->getInternalAttributes() as $ao)
-							<x-attribute-type :o="$ao" :edit="FALSE" :new="FALSE" :template="$template ?? NULL" :updated="FALSE"/>
+							<x-attribute-type :o="$ao" :edit="false" :new="false" :template="$template ?? null" :updated="false"/>
 						@endforeach
 					</div>
 				</div>
diff --git a/resources/views/frames/info.blade.php b/resources/views/frames/info.blade.php
index f53e95ba..18ed737d 100644
--- a/resources/views/frames/info.blade.php
+++ b/resources/views/frames/info.blade.php
@@ -21,7 +21,11 @@
 								: $attribute !!}
 						</th>
 						<td>
-							<x-attribute :edit="false" :o="$ao"/>
+							@if($ao instanceof \App\Classes\LDAP\Attribute\Schema\OID)
+								<x-attribute :edit="false" :o="$ao"/>
+							@else
+								{!! $ao->values_old->dot()->join('<br>') !!}
+							@endif
 						</td>
 					</tr>
 				@endforeach