fix selecting meeting menu item

opf · Jul 12, 2024 · 10f8908 · 10f8908
1 parent 13b48fc
commit 10f8908
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/modules/meeting/app/menus/meetings/menu.rb b/modules/meeting/app/menus/meetings/menu.rb
@@ -68,5 +68,18 @@ def involvement_sidebar_menu_items
     def query_path(query_params)
       polymorphic_path([@project, :meetings], query_params)
     end
+
+    def selected?(query_params)
+      case params[:query_id]
+      when nil
+        query_params[:query_id].to_s == MeetingQueries::Static::UPCOMING_INVITATIONS
+      else
+        query_params[:query_id].to_s == params[:query_id] unless modification_params?
+      end
+    end
+
+    def modification_params?
+      params.values_at(:filters, :columns, :sortBy).any?
+    end
   end
 end
diff --git a/modules/meeting/app/models/meeting_queries/static.rb b/modules/meeting/app/models/meeting_queries/static.rb
@@ -94,7 +94,7 @@ def static_query_attendee
     end
 
     def static_query_creator
-      list_with(:label_creator) do |query|
+      list_with(:label_author) do |query|
         query.where("author_id", "=", [User.current.id.to_s])
         query.order(start_time: :asc)
       end

diff --git a/modules/meeting/app/views/meetings/menus/_menu.html.erb b/modules/meeting/app/views/meetings/menus/_menu.html.erb
@@ -1,5 +1,5 @@
   <%= turbo_frame_tag "meeting_sidemenu",
-                      src: @project.present? ? menu_project_meetings_path(@project, **params.permit(:filters, :sort)) : meetings_menu_path(**params.permit(:filters, :sort)),
+                      src: @project.present? ? menu_project_meetings_path(@project, **params.permit(:filters, :sort, :query_id)) : meetings_menu_path(**params.permit(:filters, :sort, :query_id)),
                       target: '_top',
                       data: { turbo: false },
                       loading: :lazy %>