deon/phpldapadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix rendering of objectclass in server info, consistent use of true/false/null in view blades
All checks were successful
Create Docker Image / Test Application (x86_64) (push) Successful in 31s
Details
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 1m33s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 2m48s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 9s
Details

Browse Source
This commit is contained in:
Deon George 2025-06-27 18:44:25 +10:00
parent 29a659ff69
commit b22c9505bc
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/components/attribute/template/select.blade.php
View File

@ -12,7 +12,7 @@
:options="$template->attributeOptions($o->name_lc)" :options="$template->attributeOptions($o->name_lc)"
allowclear="true" allowclear="true"
:disabled="! $new" :disabled="! $new"
:readonly="FALSE"/> :readonly="false"/>
<div class="invalid-feedback pb-2"> <div class="invalid-feedback pb-2">
@if($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)) @if($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index))

2
resources/views/fragment/template/dn.blade.php
View File

@ -9,7 +9,7 @@
@php($up=(session()->get('updated') ?: collect())) @php($up=(session()->get('updated') ?: collect()))
@foreach($o->getVisibleAttributes()->filter(fn($item)=>$template->attributes->keys()->map('strtolower')->contains($item->name_lc)) as $ao) @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 @endforeach
</div> </div>
</div> </div>

8
resources/views/frames/create.blade.php
View File

@ -40,7 +40,7 @@
->filter(fn($item)=>$item->isStructural()) ->filter(fn($item)=>$item->isStructural())
->sortBy(fn($item)=>$item->name_lc) ->sortBy(fn($item)=>$item->name_lc)
->map(fn($item)=>['id'=>$item->name,'value'=>$item->name])" ->map(fn($item)=>['id'=>$item->name,'value'=>$item->name])"
:allowclear="TRUE" :allowclear="true"
/> />
</div> </div>
@ -55,7 +55,7 @@
:label="__('Select a Template').'...'" :label="__('Select a Template').'...'"
:options="$o->templates :options="$o->templates
->map(fn($item,$key)=>['id'=>$key,'value'=>$item->title])" ->map(fn($item,$key)=>['id'=>$key,'value'=>$item->title])"
:allowclear="TRUE" :allowclear="true"
/> />
</div> </div>
@endif @endif
@ -64,10 +64,10 @@
@case(2) @case(2)
<input type="hidden" name="_template" value="{{ $template?->file }}"> <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) @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 @endforeach
@if(! $template) @if(! $template)

4
resources/views/frames/dn.blade.php
View File

@ -101,7 +101,7 @@
<div class="tab-content"> <div class="tab-content">
@php($up=(session()->pull('updated') ?: collect())) @php($up=(session()->pull('updated') ?: collect()))
@foreach($o->getVisibleAttributes() as $ao) @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 @endforeach
@include('fragment.dn.add_attr') @include('fragment.dn.add_attr')
@ -124,7 +124,7 @@
<!-- Internal Attributes --> <!-- Internal Attributes -->
<div class="tab-pane mt-3" id="internal" role="tabpanel"> <div class="tab-pane mt-3" id="internal" role="tabpanel">
@foreach($o->getInternalAttributes() as $ao) @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 @endforeach
</div> </div>
</div> </div>

6
resources/views/frames/info.blade.php
View File

@ -21,7 +21,11 @@
: $attribute !!} : $attribute !!}
</th> </th>
<td> <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> </td>
</tr> </tr>
@endforeach @endforeach