When removing added objectClasses, blank out any attributes added by those objectClasses
All checks were successful
Create Docker Image / Test Application (x86_64) (push) Successful in 34s
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 1m23s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 3m30s
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s

This commit is contained in:
Deon George 2025-02-06 23:10:47 +11:00
parent c0e6b62ee5
commit bb9374ec01
4 changed files with 15 additions and 9 deletions

View File

@ -297,7 +297,7 @@ select2-container--bootstrap-5 .select2-selection--multiple .select2-selection__
font-weight: 800;
}
div#objectclass .input-group-delete {
div#objectClass .input-group-delete {
position: relative;
float: inline-end;
bottom: 30px;

View File

@ -10,7 +10,7 @@
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>{{ config('app.name') }} - @yield('htmlheader_title','🥇 The BEST ldap admin tool!')</title>
<title>{{ config('app.name') }} - @yield('htmlheader_title','🥇 An LDAP Administration Tool')</title>
<link rel="shortcut icon" href="/{{ config('app.favicon','favicon.ico') }}" />
<!-- App CSS -->

View File

@ -1,7 +1,7 @@
<div class="row pt-2">
<div @class(['col-1','d-none'=>(! $edit)])></div>
<div class="col-10 p-2">
<div id="{{ $o->name_lc }}">
<div id="{{ $o->name }}">
{{ $slot }}
</div>

View File

@ -90,7 +90,7 @@
type: 'POST',
beforeSend: function() {},
success: function(data) {
$('#{{ $o->name_lc }}').append(data);
$('#{{ $o->name }}').append(data);
},
error: function(e) {
if (e.status != 412)
@ -182,9 +182,15 @@
});
}
data.must.concat(attrs).forEach(function(attr) {
var x = $('#'+attr).find('input');
x.css('background-color','#f0c0c0').attr('readonly',true).attr('placeholder',x.val()).val('');
});
// remove the Add Values box
// Remove any keyed in values
// @todo remove any required attributes that are no longer defined as a result of removing this OC
console.log('Remove required attributes of:'+item);
console.log(attrs);
},
error: function(e) {
if (e.status != 412)
@ -206,17 +212,17 @@
@case('App\Classes\LDAP\Attribute')
@default
@php($clone=TRUE)
<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name_lc }}"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name }}-addnew"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
@section('page-scripts')
@if($clone && $edit && $o->can_addvalues)
<script type="text/javascript">
$(document).ready(function() {
// Create a new entry when Add Value clicked
$('#{{ $o->name_lc }}.addable').click(function (item) {
$('#{{ $o->name }}-addnew.addable').click(function (item) {
var cln = $(this).parent().parent().find('input:last').parent().clone();
cln.find('input:last').attr('value','').attr('placeholder', '[@lang('NEW')]');
cln.appendTo('#' + item.currentTarget.id)
cln.appendTo('#'+item.currentTarget.id.replace('-addnew',''));
});
});
</script>