forge-joniko/ldc-supportweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'trunk'

Browse source
This commit is contained in:
Vincent BRIDIER 2023-10-12 11:47:11 +02:00
commit ab08bad87e
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Models/User.php
View file

@ -85,6 +85,9 @@ class User extends Authenticatable
}
Cache::flush('AdminUsers');
});
static::created(function (User $user) {
$user->sendMailConfirm();
});
static::updating(function (User $user) {
if (Hash::needsRehash($user->password)) {
$user->password = Hash::make($user->password);

35
resources/views/bo/pages/sites/form-inputs.blade.php
View file

@ -1,7 +1,7 @@
<div class="row">
{{-- NAME --}}
<div class="col-12 col-md-6 mb-3">
<fieldset class="border h-100 bg-white p-3">
<fieldset class="h-100 border bg-white p-3">
<legend>{{ Str::ucfirst(__('validation.attributes.name')) }}</legend>
<div class="row">
<div class="col-12">
@ -31,7 +31,7 @@
</div>
{{-- USERS --}}
<div class="col-12 col-md-6 pb-3">
<fieldset class="border h-100 bg-white p-3 mb-3">
<fieldset class="h-100 mb-3 border bg-white p-3">
<legend>{{ __('models.classes.users') }}</legend>
<div class="row">
<div class="col-12 mb-3">
@ -61,7 +61,7 @@
</div>
{{-- GITLAB_PROJECT_ID --}}
<div class="col-12 col-md-6 mb-3">
<fieldset class="border h-100 bg-white p-3">
<fieldset class="h-100 border bg-white p-3">
<legend>{{ Str::ucfirst(__('validation.attributes.gitlab_project_id')) }}</legend>
<div class="row">
<div class="col-12 mb-3">
@ -72,7 +72,7 @@
'model' => Str::singular(__('models.classes.sites')),
]),
'name' => 'gitlab_project_id',
'required' => true,
'required' => false,
'model' => $siteModel ?? null,
'helper' => __('validation.integer', [
'attribute' => __(':field du :model', [
@ -81,7 +81,6 @@
]),
]),
'step' => 1,
'min' => 1
])
</div>
</div>
@ -89,11 +88,11 @@
</div>
{{-- SITE URLS --}}
<div class="col-12 mb-3">
<fieldset class="row border w-100 h-100 bg-white mx-auto p-3">
<fieldset class="row w-100 h-100 mx-auto border bg-white p-3">
<legend class="p-0">{{ __('URLs du site') }}</legend>
<div class="row w-100 mx-auto p-0">
{{-- URL_RE7 --}}
<div class="col-12 col-md-6 p-0 pe-md-3">
<div class="col-12 col-md-6 pe-md-3 p-0">
@include('bo.partials.inputs.varchar', [
'id' => 'siteUrlRe7',
'label' => __(':field du :model', [
@ -112,7 +111,7 @@
])
</div>
{{-- URL_PROD --}}
<div class="col-12 col-md-6 p-0 pe-md-3">
<div class="col-12 col-md-6 pe-md-3 p-0">
@include('bo.partials.inputs.varchar', [
'id' => 'siteUrlProd',
'label' => __(':field du :model', [
@ -137,15 +136,15 @@
</div>
@push('scripts')
<script nonce="{{ $nonce }}">
document.addEventListener("DOMContentLoaded", () => {
// Submit button clone.
const submit = document.getElementById('formSubmit')
<script nonce="{{ $nonce }}">
document.addEventListener("DOMContentLoaded", () => {
// Submit button clone.
const submit = document.getElementById('formSubmit')
submitClone = document.getElementById('formSubmitClone');
submitClone.addEventListener('click', (event) => {
event.preventDefault();
submit.click('');
})
});
</script>
submitClone.addEventListener('click', (event) => {
event.preventDefault();
submit.click('');
})
});
</script>
@endpush