Merge pull request #2716 from Leantime/filter-dropdown-fix

Filter dropdown fix
Leantime · Oct 3, 2024 · 297e0ff · 297e0ff
2 parents b4238b4 + 8b4e681
commit 297e0ff
Show file tree

Hide file tree

Showing 9 changed files with 196 additions and 258 deletions.
diff --git a/.idea/codeception.xml b/.idea/codeception.xml
diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/app/Domain/Comments/Templates/components/input.blade.php b/app/Domain/Comments/Templates/components/input.blade.php
@@ -1,29 +1,38 @@
-
-
-<form hx-post="{{ BASE_URL }}/hx/comments/comment-list/save?module={{ $module }}&moduleId={{ $moduleId }}&includeStatus={{ $includeStatus }}"
-  hx-target="#comments-{{ $module }}-{{ $moduleId }}">
- <div id="commentReplyBox-{{ $formHash }}-{{ $parentId }}" class="commentBox-{{ $formHash }} commentReplyBox-{{ $formHash }} commenterFields hidden mb-sm" >
+<form
+ hx-post="{{ BASE_URL }}/hx/comments/comment-list/save?module={{ $module }}&moduleId={{ $moduleId }}&includeStatus={{ $includeStatus }}"
+ hx-target="#comments-{{ $module }}-{{ $moduleId }}">
+ <div id="commentReplyBox-{{ $formHash }}-{{ $parentId }}"
+  class="commentBox-{{ $formHash }} commentReplyBox-{{ $formHash }} commenterFields hidden mb-sm">
  <div class="commentImage">
- <x-users::profile-image :user="array('id'=> session('userdata.id'), 'modified' => session('userdata.modified'))" ></x-users::profile-image>
+ <x-users::profile-image :user="['id' => session('userdata.id'), 'modified' => session('userdata.modified')]"></x-users::profile-image>
  </div>
  <div class="commentReply">
  <x-global::forms.submit-button name="{{ __('links.save') }}" />
- <x-global::forms.reset-button name="{{ __('links.cancel') }}" onclick="leantime.commentsComponent.resetForm(-1, '{{ $formHash }}')" />
+ <x-global::forms.reset-button name="{{ __('links.cancel') }}"
+ onclick="leantime.commentsComponent.resetForm(-1, '{{ $formHash }}')" />
 
- @if(isset($statusUpdates) && $statusUpdates)
+ @if (isset($statusUpdates) && $statusUpdates)
  <div class="inlineLabelDropdown float-right">
  <label>{{ __('text.highlight_status') }}</label>
- <x-global::forms.dropdownPill class="float-right" :type="'simpleStatus'" :extraClass="'dropRight'" :selectedKey="'none'" :selectedClass="'none'" :options="['none'=>__('label.project_status_none'), 'red'=>__('label.project_status_red'), 'yellow'=>__('label.project_status_yellow'), 'green'=>__('label.project_status_green')]"></x-global::forms.dropdownPill>
+ <x-global::forms._archive.dropdownPill class="float-right" :type="'simpleStatus'" :extraClass="'dropRight'"
+ :selectedKey="'none'" :selectedClass="'none'" :options="[
+ 'none' => __('label.project_status_none'),
+ 'red' => __('label.project_status_red'),
+ 'yellow' => __('label.project_status_yellow'),
+ 'green' => __('label.project_status_green'),
+ ]"></x-global::forms._archive.dropdownPill>
  </div>
  @endif
 
  </div>
 
- <input type="hidden" name="saveComment" class="commenterField" value="1"/>
- <input type="hidden" name="editComment" class="commenterField" id="edit-comment-{{ $formHash }}-{{ $parentId }}" value="" />
- <input type="hidden" name="father" class="commenterField" id="father-{{ $formHash }}" value="{{ $parentId }}"/>
+ <input type="hidden" name="saveComment" class="commenterField" value="1" />
+ <input type="hidden" name="editComment" class="commenterField"
+ id="edit-comment-{{ $formHash }}-{{ $parentId }}" value="" />
+ <input type="hidden" name="father" class="commenterField" id="father-{{ $formHash }}"
+ value="{{ $parentId }}" />
 
  <div class="clearall"></div>
- <br/>
+ <br />
  </div>
 </form>