Skip to content

Commit 0c2d39f

Browse files
authored
Merge pull request #599 from dbarzin/dev
Dev
2 parents 1df558b + 35c9762 commit 0c2d39f

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.env.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,3 @@ OIDC_USE_ID_TOKEN=false # true pour décoder le JWT
110110
OIDC_JWT_ALG=RS256 # RS256 ou HS256. utile uniquement avec OIDC_USE_ID_TOKEN=true
111111
OIDC_JWT_SECRET_OR_KEY="" # secret pour HS256 ou clé au format PEM pour RS256
112112
OIDC_REDIRECT_URI=${APP_URL}auth/callback/oidc
113-
APP_VERSION=2025.08.13

app/Http/Controllers/ControlController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1566,6 +1566,7 @@ public function save(Request $request)
15661566
$control->realisation_date = request('realisation_date');
15671567
$control->observations = request('observations');
15681568
$control->note = request('note');
1569+
$control->indicator = request('indicator');
15691570
$control->score = request('score');
15701571
$control->action_plan = request('action_plan');
15711572
$control->periodicity = request('periodicity');

app/Http/Controllers/SocialiteController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public function callback(Request $_request, string $provider)
6868
$allow_createUser = false;
6969
$allow_updateUser = false;
7070
if (config($config_name)) {
71-
$allow_createUser = config($config_name.'.allow_create_User', $allow_createUser);
72-
$allow_updateUser = config($config_name.'.allow_update_User', $allow_updateUser);
71+
$allow_createUser = config($config_name.'.allow_create_user', $allow_createUser);
72+
$allow_updateUser = config($config_name.'.allow_update_user', $allow_updateUser);
7373
}
7474
Log::debug('CONFIG: allow_createUser='.($allow_createUser ? 'true' : 'false'));
7575
Log::debug('CONFIG: allow_updateUser='.($allow_updateUser ? 'true' : 'false'));

resources/views/controls/edit.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<strong>{{ trans("cruds.control.fields.indicator") }}</strong>
158158
</div>
159159
<div class="cell-lg-6 cell-md-10">
160-
<pre>{{ $control->indicator }}</pre>
160+
<textarea class="textarea" name="indicator" rows="3" data-role="textarea" data-clear-button="false">{{ $errors->has('indicator') ? old('indicator') : $control->indicator }}</textarea>
161161
</div>
162162
</div>
163163

0 commit comments

Comments
 (0)