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

Consistent naming for modal items and move dn into javascript variable for DN entry

Browse Source
This commit is contained in:
Deon George 2025-01-19 21:54:01 +11:00
parent 3d40288506
commit 05012c9e6c
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/themes/architect/views/layouts/partials/contentheader.blade.php
View File

@ -40,7 +40,7 @@
@if (isset($page_actions) && $page_actions->contains('export')) @if (isset($page_actions) && $page_actions->contains('export'))
<li class="nav-item"> <li class="nav-item">
<a class="nav-link pt-0 pb-1"> <a class="nav-link pt-0 pb-1">
<button type="button" class="p-2 m-0 border-0 btn-transition btn btn-outline-dark w-100 text-start" data-bs-toggle="modal" data-bs-target="#entry-export-modal" {{--data-bs-whatever="ldif"--}}> <button type="button" class="p-2 m-0 border-0 btn-transition btn btn-outline-dark w-100 text-start" data-bs-toggle="modal" data-bs-target="#entry_export-modal">
<i class="fas fa-fw fa-file-export me-2"></i> @lang('Export') <i class="fas fa-fw fa-file-export me-2"></i> @lang('Export')
</button> </button>
</a> </a>

2
resources/views/components/attribute/password.blade.php
View File

@ -22,7 +22,7 @@
<div class="row"> <div class="row">
<div class="offset-1 col-4 p-2"> <div class="offset-1 col-4 p-2">
<span class="p-0 m-0"> <span class="p-0 m-0">
<button type="button" class="btn btn-transition btn-sm btn-outline-dark mt-3" data-bs-toggle="modal" data-bs-target="#userpassword-check-modal"><i class="fas fa-user-check"></i> @lang('Check Password')</button> <button type="button" class="btn btn-transition btn-sm btn-outline-dark mt-3" data-bs-toggle="modal" data-bs-target="#userpassword_check-modal"><i class="fas fa-user-check"></i> @lang('Check Password')</button>
</span> </span>
</div> </div>
</div> </div>

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

@ -28,7 +28,7 @@
<form id="dn-edit" method="POST" class="needs-validation" action="{{ url('entry/update/pending') }}" novalidate> <form id="dn-edit" method="POST" class="needs-validation" action="{{ url('entry/update/pending') }}" novalidate>
@csrf @csrf
<input type="hidden" name="dn" value="{{ $o->getDNSecure() }}"> <input type="hidden" name="dn" value="">
@foreach ($o->getVisibleAttributes() as $ao) @foreach ($o->getVisibleAttributes() as $ao)
<x-attribute-type :edit="true" :o="$ao"/> <x-attribute-type :edit="true" :o="$ao"/>
@ -113,21 +113,21 @@
@section('page-modals') @section('page-modals')
<!-- EXPORT --> <!-- EXPORT -->
<div class="modal fade" id="entry-export-modal" tabindex="-1" aria-labelledby="entry-export-label" aria-hidden="true"> <div class="modal fade" id="entry_export-modal" tabindex="-1" aria-labelledby="entry_export-label" aria-hidden="true">
<div class="modal-dialog modal-lg modal-fullscreen-xl-down"> <div class="modal-dialog modal-lg modal-fullscreen-xl-down">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h1 class="modal-title fs-5" id="entry-export-label">LDIF for {{ $dn }}</h1> <h1 class="modal-title fs-5" id="entry_export-label">LDIF for {{ $dn }}</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div id="entry-export"><div class="fa-3x"><i class="fas fa-spinner fa-pulse fa-sm"></i></div></div> <div id="entry_export"><div class="fa-3x"><i class="fas fa-spinner fa-pulse fa-sm"></i></div></div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary btn-sm" id="entry-export-download">Download</button> <button type="button" class="btn btn-primary btn-sm" id="entry_export-download">Download</button>
</div> </div>
</div> </div>
</div> </div>
@ -135,11 +135,11 @@
@if($up=$o->getObject('userpassword')) @if($up=$o->getObject('userpassword'))
<!-- CHECK USERPASSWORD --> <!-- CHECK USERPASSWORD -->
<div class="modal fade" id="userpassword-check-modal" tabindex="-1" aria-labelledby="userpassword-check-label" aria-hidden="true"> <div class="modal fade" id="userpassword_check-modal" tabindex="-1" aria-labelledby="userpassword_check-label" aria-hidden="true">
<div class="modal-dialog modal-lg modal-fullscreen-lg-down"> <div class="modal-dialog modal-lg modal-fullscreen-lg-down">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h1 class="modal-title fs-5" id="userpassword-check-label">Check Passwords for {{ $dn }}</h1> <h1 class="modal-title fs-5" id="userpassword_check-label">Check Passwords for {{ $dn }}</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
@ -162,7 +162,7 @@
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary btn-sm" id="userpassword_check_submit"><i class="fas fa-fw fa-spinner fa-spin d-none"></i> Check</button> <button type="button" class="btn btn-primary btn-sm" id="userpassword_check-submit"><i class="fas fa-fw fa-spinner fa-spin d-none"></i> Check</button>
</div> </div>
</div> </div>
</div> </div>
@ -172,6 +172,8 @@
@section('page-scripts') @section('page-scripts')
<script type="text/javascript"> <script type="text/javascript">
var dn = '{{ $o->getDNSecure() }}';
function download(filename,text) { function download(filename,text) {
var element = document.createElement('a'); var element = document.createElement('a');
@ -185,6 +187,8 @@
} }
function editmode() { function editmode() {
$('#dn-edit input[name="dn"]').val(dn);
$('button[id=entry-edit]').addClass('active').removeClass('btn-outline-dark').addClass('btn-outline-light'); $('button[id=entry-edit]').addClass('active').removeClass('btn-outline-dark').addClass('btn-outline-light');
// Find all input items and turn off readonly // Find all input items and turn off readonly
@ -239,33 +243,33 @@
editmode(); editmode();
}); });
$('#entry-export-download').on('click',function(item) { $('#entry_export-download').on('click',function(item) {
item.preventDefault(); item.preventDefault();
let ldif = $('#entry-export').find('pre:first'); // update this selector in your local version let ldif = $('#entry_export').find('pre:first'); // update this selector in your local version
download('ldap-export.ldif',ldif.html()); download('ldap-export.ldif',ldif.html());
}); });
$('#entry-export-modal').on('shown.bs.modal',function() { $('#entry_export-modal').on('shown.bs.modal',function() {
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
success: function(data) { success: function(data) {
$('#entry-export').empty().append(data); $('#entry_export').empty().append(data);
}, },
error: function(e) { error: function(e) {
if (e.status != 412) if (e.status != 412)
alert('That didnt work? Please try again....'); alert('That didnt work? Please try again....');
}, },
url: '{{ url('entry/export',$o->getDNSecure()) }}/', url: '{{ url('entry/export') }}/'+dn,
cache: false cache: false
}) })
}) })
@if($up) @if($up)
$('button[id=userpassword_check_submit]').on('click',function(item) { $('button[id=userpassword_check-submit]').on('click',function(item) {
var that = $(this); var that = $(this);
var passwords = $('#userpassword-check-modal') var passwords = $('#userpassword_check-modal')
.find('input[name^="password["') .find('input[name^="password["')
.map((key,item)=>item.value); .map((key,item)=>item.value);
@ -284,16 +288,14 @@
}, },
success: function(data) { success: function(data) {
data.forEach(function(item,key) { data.forEach(function(item,key) {
var i = $('#userpassword-check-modal') var i = $('#userpassword_check-modal')
.find('input[name="password['+key+']') .find('input[name="password['+key+']')
.siblings('i'); .siblings('i');
var feedback = $('#userpassword-check-modal') var feedback = $('#userpassword_check-modal')
.find('input[name="password['+key+']') .find('input[name="password['+key+']')
.siblings('div.invalid-feedback'); .siblings('div.invalid-feedback');
console.log(feedback.attr('display'));
if (item === 'OK') { if (item === 'OK') {
i.removeClass('text-danger').addClass('text-success').removeClass('fa-lock').addClass('fa-lock-open'); i.removeClass('text-danger').addClass('text-success').removeClass('fa-lock').addClass('fa-lock-open');
if (feedback.is(':visible')) if (feedback.is(':visible'))
@ -311,7 +313,7 @@
}, },
url: '{{ url('entry/password/check') }}', url: '{{ url('entry/password/check') }}',
data: { data: {
dn: '{{ $o->getDNSecure() }}', dn: dn,
password: Array.from(passwords), password: Array.from(passwords),
}, },
dataType: 'json', dataType: 'json',