Merge branch 'master' into csvImprovements

Leantime · Nov 27, 2024 · 881930d · 881930d
2 parents f44dbb8 + 445c464
commit 881930d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 417 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -46,7 +46,7 @@ body:
   - type: textarea
     id: context
     attributes:
-      label: Additional Notes
-      description: "Please add any additional context you can share"
+      label: Error Logs (LEANTIMEFOLDER/storage/logs)
+      description: "Please past the contents of your error logs and any other logs you may have."
     validations:
       required: false
diff --git a/app/Domain/Users/Controllers/EditOwn.php b/app/Domain/Users/Controllers/EditOwn.php
@@ -202,6 +202,7 @@ public function post(): Response
                     ];
 
                     if (password_verify($_POST['currentPassword'], $values['password'])) {
+
                         if ($_POST['newPassword'] == $_POST['confirmPassword']) {
                             if ($this->userService->checkPasswordStrength($_POST['newPassword'])) {
                                 $values['password'] = $_POST['newPassword'];
@@ -307,7 +308,7 @@ public function post(): Response
                     $this->userRepo->editOwn($values, $this->userId);
 
                     // Storing option messagefrequency
-                    $this->settingsService->saveSetting('usersettings.'.$this->userId.'.messageFrequency', (int) $_POST['messagesfrequency']);
+                    $this->settingsService->saveSetting('usersettings.'.$this->userId.'.messageFrequency', (int) $_POST['messagesfrequency'] ?? 3600);
 
                     $this->tpl->setNotification($this->language->__('notifications.changed_profile_settings_successfully'), 'success', 'profilesettings_updated');
                 }

diff --git a/app/Domain/Users/Templates/editOwn.blade.php b/app/Domain/Users/Templates/editOwn.blade.php
@@ -288,7 +288,7 @@
                                 <div class="form-group">
                                     <label for="notifications" >{{ __('label.receive_notifications') }}</label>
                                     <span>
-                                        <input type="checkbox" value="" name="notifications" class="input"
+                                        <input type="checkbox" value="on" name="notifications" class="input"
                                                id="notifications"
                                                @if ($values['notifications'] == "1" )
                                                    checked='checked'