Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<% [existing_action?(collection_presenter.resource_name, :edit),
existing_action?(collection_presenter.resource_name, :destroy)].count(true).times do %>
<th scope="col" class="cell-label--action-button"></th>
<% colspan = [
existing_action?(collection_presenter.resource_name, :edit),
existing_action?(collection_presenter.resource_name, :destroy),
].count(true)
%>

<% if colspan > 0 %>
<th scope="col" class="cell-label--action-button" colspan="<%= colspan %>"><%= t("administrate.table.actions") %></th>
<% end %>
2 changes: 2 additions & 0 deletions config/locales/administrate.ar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ ar:
search:
clear: مسح البحث
label: بحث %{resource}
table:
actions: العمليات
2 changes: 2 additions & 0 deletions config/locales/administrate.bs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ bs:
search:
clear: Izbriši pretraživanje
label: Pretraga %{resource}
table:
actions: Akcije
2 changes: 2 additions & 0 deletions config/locales/administrate.ca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ ca:
search:
clear: Esborrar la cerca
label: Cerca %{resource}
table:
actions: Accions
2 changes: 2 additions & 0 deletions config/locales/administrate.da.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ da:
search:
clear: Ryd søgning
label: Søg %{resource}
table:
actions: Handlinger
2 changes: 2 additions & 0 deletions config/locales/administrate.de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ de:
search:
clear: Suche zurücksetzen
label: "%{resource} durchsuchen"
table:
actions: Aktionen
2 changes: 2 additions & 0 deletions config/locales/administrate.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ en:
search:
clear: Clear search
label: Search %{resource}
table:
actions: Actions
2 changes: 2 additions & 0 deletions config/locales/administrate.es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ es:
search:
clear: Borrar búsqueda
label: Buscar %{resource}
table:
actions: Acciones
2 changes: 2 additions & 0 deletions config/locales/administrate.fi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ fi:
search:
clear: Tyhjennä haku
label: Etsi %{resource}
table:
actions: Toiminnot
2 changes: 2 additions & 0 deletions config/locales/administrate.fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ fr:
search:
clear: Effacer la recherche
label: Chercher %{resource}
table:
actions: Actions
2 changes: 2 additions & 0 deletions config/locales/administrate.id.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ id:
search:
clear: Kosongkan pencarian
label: Cari %{resource}
table:
actions: Aksi
2 changes: 2 additions & 0 deletions config/locales/administrate.it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ it:
search:
clear: Cancella ricerca
label: Ricerca %{resource}
table:
actions: Azioni
2 changes: 2 additions & 0 deletions config/locales/administrate.ja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ ja:
search:
clear: 検索をクリアする
label: "%{resource}を検索"
table:
actions: 操作
2 changes: 2 additions & 0 deletions config/locales/administrate.ko.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ ko:
search:
clear: 검색 초기화
label: "%{resource} 검색"
table:
actions: 작업
2 changes: 2 additions & 0 deletions config/locales/administrate.nl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ nl:
search:
clear: Wissen
label: Zoeken %{resource}
table:
actions: Acties
2 changes: 2 additions & 0 deletions config/locales/administrate.pl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ pl:
search:
clear: Wyczyść wyszukiwanie
label: Szukanie %{resource}
table:
actions: Akcje
2 changes: 2 additions & 0 deletions config/locales/administrate.pt-BR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ pt-BR:
search:
clear: Limpar pesquisa
label: Pesquisa %{resource}
table:
actions: Ações
2 changes: 2 additions & 0 deletions config/locales/administrate.pt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ pt:
search:
clear: Limpar pesquisa
label: Pesquisa %{resource}
table:
actions: Ações
2 changes: 2 additions & 0 deletions config/locales/administrate.ru.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ ru:
search:
clear: Очистить поиск
label: Поиск %{resource}
table:
actions: Действия
2 changes: 2 additions & 0 deletions config/locales/administrate.sl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ sl:
search:
clear: Počisti iskanje
label: Išči %{resource}
table:
actions: Dejanja
2 changes: 2 additions & 0 deletions config/locales/administrate.sq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ sq:
search:
clear: Pastro kërkimin
label: Kërko %{resource}
table:
actions: Veprime
2 changes: 2 additions & 0 deletions config/locales/administrate.sv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ sv:
search:
clear: Rensa sökningen
label: Sök %{resource}
table:
actions: Åtgärder
2 changes: 2 additions & 0 deletions config/locales/administrate.tr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ tr:
search:
clear: Temizle
label: "%{resource} içerisinde ara"
table:
actions: İşlemler
2 changes: 2 additions & 0 deletions config/locales/administrate.uk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ uk:
search:
clear: Очистити пошук
label: пошук %{resource}
table:
actions: Дії
2 changes: 2 additions & 0 deletions config/locales/administrate.vi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ vi:
search:
clear: Tìm kiếm rõ ràng
label: Tìm kiếm %{resource}
table:
actions: Hành động
2 changes: 2 additions & 0 deletions config/locales/administrate.zh-CN.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ zh-CN:
search:
clear: 清除搜索
label: 搜索 %{resource}
table:
actions: 操作
4 changes: 3 additions & 1 deletion config/locales/administrate.zh-TW.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@ zh-TW:
back_to_app: 返回首頁
search:
clear: 清除搜尋
label: 搜尋 %{resource}
label: 搜尋 %{resource}
table:
actions: 操作
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<%
[
existing_action?(collection_presenter.resource_name, :edit),
existing_action?(collection_presenter.resource_name, :destroy),
resources.klass == Customer, # "Become" action
].count(true).times do %>
<th scope="col" class="cell-label--action-button"></th>
<% colspan = [
existing_action?(collection_presenter.resource_name, :edit),
existing_action?(collection_presenter.resource_name, :destroy),
# "Become" action
resources.klass == Customer
].count(true)
%>

<% if colspan > 0 %>
<th scope="col" class="cell-label--action-button" colspan="<%= colspan %>"><%= t("administrate.table.actions") %></th>
<% end %>
8 changes: 8 additions & 0 deletions spec/features/index_page_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
expect(page).to have_content(customer.email)
end

it "displays table headers" do
visit admin_customers_path

expect(page).to have_table_header("Name")
expect(page).to have_table_header("Email")
expect(page).to have_table_header("Actions")
end

it "adds resource/attribute name to table headers" do
visit admin_customers_path

Expand Down