diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb index 597e35f7d..ecbfe1511 100644 --- a/app/controllers/concerns/day_timelines_scoped.rb +++ b/app/controllers/concerns/day_timelines_scoped.rb @@ -4,12 +4,19 @@ module DayTimelinesScoped included do include FilterScoped + before_action :normalize_collection_params before_action :restore_collections_filter_from_cookie before_action :set_day_timeline after_action :save_collections_filter_to_cookie end private + def normalize_collection_params + if params[:collection_ids].blank? && !params[:clear_filter] + params[:clear_filter] = true + end + end + def restore_collections_filter_from_cookie if params[:clear_filter] delete_collections_filter_cookie diff --git a/app/helpers/time_helper.rb b/app/helpers/time_helper.rb index c3fd4f066..50295789b 100644 --- a/app/helpers/time_helper.rb +++ b/app/helpers/time_helper.rb @@ -1,5 +1,5 @@ module TimeHelper def local_datetime_tag(datetime, style: :time, **attributes) - tag.time **attributes, datetime: datetime.iso8601, data: { local_time_target: style } + tag.time **attributes, datetime: datetime.iso8601, data: { local_time_target: style, action: "turbo:morph-element->local-time#refreshTarget" } end end diff --git a/app/javascript/controllers/local_time_controller.js b/app/javascript/controllers/local_time_controller.js index e539d9eb5..7e38772c9 100644 --- a/app/javascript/controllers/local_time_controller.js +++ b/app/javascript/controllers/local_time_controller.js @@ -37,6 +37,12 @@ export default class extends Controller { }) } + refreshTarget(event) { + const target = event.target; + const targetName = target.dataset.localTimeTarget + this.#formatTime(this[`${targetName}Formatter`], target) + } + timeTargetConnected(target) { this.#formatTime(this.timeFormatter, target) } diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb index 0f7b88dd6..121a0e2d4 100644 --- a/app/models/card/closeable.rb +++ b/app/models/card/closeable.rb @@ -34,7 +34,7 @@ module Card::Closeable end def closing_soon? - considering? && Time.current >= auto_close_at - AUTO_CLOSE_REMINDER_BEFORE + considering? && auto_closing? && Time.current >= auto_close_at - AUTO_CLOSE_REMINDER_BEFORE end def closed? diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb index 86c4592ee..b735a29c8 100644 --- a/app/views/cards/index/_collections_filter.html.erb +++ b/app/views/cards/index/_collections_filter.html.erb @@ -5,7 +5,7 @@ <% end %> <% if Current.user.collections.one? %> - <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center", style: "--hover-size: 0" do %> + <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center" do %> <%= tag.div class: "btn popup__item min-width flex-item-grow" do %> <%= Current.user.collections.first.name %> GO TO › @@ -13,14 +13,14 @@ <% end %> <% elsif Current.user.collections.many? %> <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center", style: "--hover-size: 0" do %> -
+
+ <%= tag.div class: "btn popup__item min-width flex-item-grow" do %> All collections GO TO › @@ -29,7 +29,7 @@ <% Current.user.collections.order(:name).each do |collection| %>
  • -
    +
    + <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width flex-item-grow" do %> <%= collection.name %> diff --git a/app/views/collections/edit/_auto_close.html.erb b/app/views/collections/edit/_auto_close.html.erb index 84be06644..e0a05df2b 100644 --- a/app/views/collections/edit/_auto_close.html.erb +++ b/app/views/collections/edit/_auto_close.html.erb @@ -1,4 +1,4 @@ -Auto-Close Cards +Do or Die <%= form_with model: collection, data: { controller: "form" } do |form| %> diff --git a/app/views/events/filter/_all_collections_option.html.erb b/app/views/events/filter/_all_collections_option.html.erb index 24ab518df..0f57357c9 100644 --- a/app/views/events/filter/_all_collections_option.html.erb +++ b/app/views/events/filter/_all_collections_option.html.erb @@ -6,21 +6,18 @@ <% end %> <% end %> <% elsif Current.user.collections.many? %> -
    -
    - <%= link_to events_path(clear_filter: true), style: "--hover-size: 0" do %> +
    + <%= link_to events_path(clear_filter: true), class: "btn txt-xx-small flex-item-no-shrink" do %> <%= check_box_tag "filter_collections", nil, filter.collections.blank?, class: "form-checkbox" %> + + See everything in all collections + + <%= icon_tag "check", size: 18, class: "checked" %> <% end %> - - See everything in all collections - - <%= icon_tag "check", size: 18, class: "checked" %> -
    - - <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "btn popup__item min-width flex-item-grow" do %> - All collections - GO TO › - <% end %> + <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "btn popup__item min-width flex-item-grow" do %> + All collections + GO TO › + <% end %>
    <% end %> \ No newline at end of file diff --git a/app/views/events/filter/_collection_option.html.erb b/app/views/events/filter/_collection_option.html.erb index bdc2877b6..b2c2bc77e 100644 --- a/app/views/events/filter/_collection_option.html.erb +++ b/app/views/events/filter/_collection_option.html.erb @@ -1,5 +1,5 @@
  • -
    +
    + <%= link_to cards_path(collection_ids: [ collection ]), class: "btn popup__item min-width flex-item-grow" do %> <%= collection.name %>