Skip to content

Dev #599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbarzin merged 5 commits into from
Apr 7, 2026
Merged

Dev #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0c291b
Fix case sensitivity in user creation/update config
wouldsmina Mar 30, 2026
1726ae2
Merge pull request #594 from wouldsmina/patch-typo
dbarzin Mar 30, 2026
4e04d6f
remove APP_VERSION from .env
dbarzin Apr 7, 2026
1abc96f
Merge branch 'dev' of github.com:dbarzin/deming into dev
dbarzin Apr 7, 2026
35c9762
add edit control model
dbarzin Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,3 @@ OIDC_CLIENT_SECRET=deming
OIDC_BASE_URL=http://auth.lan
OIDC_SUFFIX=""
OIDC_REDIRECT_URI=${APP_URL}auth/callback/oidc
APP_VERSION=2025.08.13
1 change: 1 addition & 0 deletions app/Http/Controllers/ControlController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,6 +1566,7 @@ public function save(Request $request)
$control->realisation_date = request('realisation_date');
$control->observations = request('observations');
$control->note = request('note');
$control->indicator = request('indicator');
$control->score = request('score');
$control->action_plan = request('action_plan');
$control->periodicity = request('periodicity');
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/SocialiteController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ public function callback(Request $_request, string $provider)
$allow_createUser = false;
$allow_updateUser = false;
if (config($config_name)) {
$allow_createUser = config($config_name.'.allow_create_User', $allow_createUser);
$allow_updateUser = config($config_name.'.allow_update_User', $allow_updateUser);
$allow_createUser = config($config_name.'.allow_create_user', $allow_createUser);
$allow_updateUser = config($config_name.'.allow_update_user', $allow_updateUser);
}
Log::debug('CONFIG: allow_createUser='.($allow_createUser ? 'true' : 'false'));
Log::debug('CONFIG: allow_updateUser='.($allow_updateUser ? 'true' : 'false'));
Expand Down
2 changes: 1 addition & 1 deletion resources/views/controls/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<strong>{{ trans("cruds.control.fields.indicator") }}</strong>
</div>
<div class="cell-lg-6 cell-md-10">
<pre>{{ $control->indicator }}</pre>
<textarea class="textarea" name="indicator" rows="3" data-role="textarea" data-clear-button="false">{{ $errors->has('indicator') ? old('indicator') : $control->indicator }}</textarea>
</div>
</div>

Expand Down
⚡