Projects -> Collections
This commit is contained in:
@@ -38,7 +38,7 @@ module Filter::Summarized
|
||||
if buckets.any?
|
||||
"in #{buckets.pluck(:name).to_choice_sentence}"
|
||||
else
|
||||
"in all projects"
|
||||
"in all collections"
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
<header class="flex flex-column center">
|
||||
<div class="flex align-center gap justify-center">
|
||||
<%= link_to "Projects", root_path %>
|
||||
<%= link_to "Collections", root_path %>
|
||||
<%= link_to "Activity", events_path %>
|
||||
</div>
|
||||
<h1 class="txt-x-large"><%= @page_title %></h1>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
data-action="keydown.esc->dialog#close:stop click@document->dialog#closeOnClickOutside turbo:before-cache@document->dialog#close">
|
||||
<h1 class="txt-x-large margin-none-block-end">
|
||||
<% if filter.buckets.none? %>
|
||||
All projects
|
||||
All collections
|
||||
<% elsif filter.buckets.one? %>
|
||||
<%= filter.buckets.first.name %>
|
||||
<% else %>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
<header class="flex flex-column center">
|
||||
<div class="flex align-center gap justify-center">
|
||||
<%= link_to "Projects", root_path %>
|
||||
<%= link_to "Collections", root_path %>
|
||||
<%= link_to "Activity", events_path %>
|
||||
</div>
|
||||
<%= render "bubbles/filters", filter: @filter %>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<nav class="align-start max-width">
|
||||
<header class="flex flex-column center max-width">
|
||||
<div class="flex align-center gap justify-center">
|
||||
<%= link_to "Projects", root_path %>
|
||||
<%= link_to "Collections", root_path %>
|
||||
<%= link_to "Activity", events_path %>
|
||||
</div>
|
||||
<h1 class="txt-large txt-align-center min-width flex align-center gap-half margin-block-end">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<% @page_title = "All projects" %>
|
||||
<% @page_title = "Collections" %>
|
||||
|
||||
<% content_for :header do %>
|
||||
<nav class="align-start">
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
<header class="flex flex-column center">
|
||||
<div class="flex align-center gap justify-center">
|
||||
<%= link_to "Projects", root_path %>
|
||||
<%= link_to "Collections", root_path %>
|
||||
<%= link_to "Activity", events_path %>
|
||||
</div>
|
||||
<h1 class="txt-x-large"><%= @page_title %></h1>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<nav class="align-start">
|
||||
<header class="flex flex-column center">
|
||||
<div class="flex align-center gap justify-center">
|
||||
<%= link_to "Projects", root_path %>
|
||||
<%= link_to "Collections", root_path %>
|
||||
<%= link_to "Activity", events_path %>
|
||||
</div>
|
||||
<h1 class="txt-x-large"><%= @page_title %></h1>
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
<li class="filter__label"><strong>In Project</strong></li>
|
||||
|
||||
<li>
|
||||
<%= button_tag "All Projects", type: :button, class: "btn filter__button", data: { action: "filter-form#clearCategory", filter_form_name_param: "bucket_ids[]" } %>
|
||||
<%= button_tag "All Collections", type: :button, class: "btn filter__button", data: { action: "filter-form#clearCategory", filter_form_name_param: "bucket_ids[]" } %>
|
||||
</li>
|
||||
<% Current.user.buckets.order(:name).each do |bucket| %>
|
||||
<li>
|
||||
@@ -162,7 +162,7 @@
|
||||
<div class="flex align-center txt-align-center justify-space-between gap-half margin-block-start">
|
||||
<%= tag.button class: "btn", form: :filter_form, formaction: filters_path, formmethod: :post do %>
|
||||
<%= image_tag "bubbles.svg", aria: { hidden: true }, size: 24 %>
|
||||
<span>Save to home</span>
|
||||
<span>Save collection</span>
|
||||
<% end %>
|
||||
|
||||
<button class="btn btn--reversed" form="filter_form">
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<nav>
|
||||
<header class="flex flex-column center margin-block-end">
|
||||
<div class="flex align-center gap justify-center">
|
||||
<%= link_to "Projects", root_path %>
|
||||
<%= link_to "Collections", root_path %>
|
||||
<%= link_to "Activity", events_path %>
|
||||
</div>
|
||||
<h1 class="txt-x-large"><%= @page_title %></h1>
|
||||
|
||||
@@ -103,10 +103,10 @@ class FilterTest < ActiveSupport::TestCase
|
||||
end
|
||||
|
||||
test "summary" do
|
||||
assert_equal "Most discussed, tagged #Mobile, and assigned to JZ in all projects", filters(:jz_assignments).summary
|
||||
assert_equal "Most discussed, tagged #Mobile, and assigned to JZ in all collections", filters(:jz_assignments).summary
|
||||
|
||||
filters(:jz_assignments).update!(stages: workflow_stages(:qa_triage, :qa_in_progress))
|
||||
assert_equal "Most discussed, tagged #Mobile, assigned to JZ, and staged in Triage or In Progress in all projects", filters(:jz_assignments).summary
|
||||
assert_equal "Most discussed, tagged #Mobile, assigned to JZ, and staged in Triage or In Progress in all collections", filters(:jz_assignments).summary
|
||||
|
||||
filters(:jz_assignments).update!(stages: [], assignees: [], tags: [], buckets: [ buckets(:writebook) ])
|
||||
assert_equal "Most discussed in Writebook", filters(:jz_assignments).summary
|
||||
|
||||
Reference in New Issue
Block a user