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

Fix schema viewer, showing objectClass name in used_in and not oid

Browse Source
This commit is contained in:
Deon George 2025-07-17 21:28:40 +08:00
parent 2ff0a10901
commit d90bc32887
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Classes/LDAP/Attribute.php
View File

@ -64,8 +64,8 @@ class Attribute implements \Countable, \ArrayAccess
$soc = config('server')->schema('objectclasses',$objectclass); $soc = config('server')->schema('objectclasses',$objectclass);
if ($soc) { if ($soc) {
$this->oc->push($soc->oid); $this->oc->push($soc->name);
$this->oc = $this->oc->merge($soc->getParents()->pluck('oid')); $this->oc = $this->oc->merge($soc->getParents()->pluck('name'));
} }
} }
} }

4
app/Classes/LDAP/Server.php
View File

@ -463,11 +463,11 @@ final class Server
foreach ($o->attributes as $attribute) { foreach ($o->attributes as $attribute) {
if (($attrid = $this->schema('attributetypes')->search(fn($item)=>$item->oid === $attribute->oid)) !== FALSE) { if (($attrid = $this->schema('attributetypes')->search(fn($item)=>$item->oid === $attribute->oid)) !== FALSE) {
// Add Used In. // Add Used In.
$this->attributetypes[$attrid]->addUsedInObjectClass($o->oid,$o->isStructural()); $this->attributetypes[$attrid]->addUsedInObjectClass($o->name,$o->isStructural());
// Add Required By. // Add Required By.
if ($attribute->is_must) if ($attribute->is_must)
$this->attributetypes[$attrid]->addRequiredByObjectClass($o->oid,$o->isStructural()); $this->attributetypes[$attrid]->addRequiredByObjectClass($o->name,$o->isStructural());
} }
} }
} }

4
resources/views/fragment/schema/attributetypes.blade.php
View File

@ -88,11 +88,11 @@
<td>@lang('Used by ObjectClasses')</td> <td>@lang('Used by ObjectClasses')</td>
<td> <td>
@if($o->used_in_object_classes->count()) @if($o->used_in_object_classes->count())
@foreach($o->used_in_object_classes as $class => $structural) @foreach($o->used_in_object_classes as $name => $structural)
@if($structural) @if($structural)
<strong> <strong>
@endif @endif
<a class="objectclass" id="{{ strtolower($class) }}" href="#{{ strtolower($class) }}">{{ $class }}</a> <a class="objectclass" id="{{ strtolower($name) }}" href="#{{ strtolower($name) }}">{{ $name }}</a>
@if($structural) @if($structural)
</strong> </strong>
@endif @endif