administrate 0.10.0 → 0.15.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/administrate/components/associative.js +5 -0
- data/app/assets/javascripts/administrate/components/date_time_picker.js +6 -2
- data/app/assets/javascripts/administrate/components/table.js +1 -1
- data/app/assets/stylesheets/administrate/base/_tables.scss +3 -0
- data/app/assets/stylesheets/administrate/base/_typography.scss +1 -1
- data/app/assets/stylesheets/administrate/components/_attributes.scss +4 -3
- data/app/assets/stylesheets/administrate/components/_buttons.scss +8 -0
- data/app/assets/stylesheets/administrate/components/_cells.scss +2 -0
- data/app/assets/stylesheets/administrate/components/_field-unit.scss +17 -4
- data/app/assets/stylesheets/administrate/components/_flashes.scss +0 -8
- data/app/assets/stylesheets/administrate/components/_main-content.scss +1 -0
- data/app/assets/stylesheets/administrate/components/_navigation.scss +2 -3
- data/app/assets/stylesheets/administrate/library/_variables.scss +10 -8
- data/app/controllers/administrate/application_controller.rb +33 -9
- data/app/controllers/concerns/administrate/punditize.rb +3 -3
- data/app/helpers/administrate/application_helper.rb +47 -15
- data/app/views/administrate/application/_collection.html.erb +8 -7
- data/app/views/administrate/application/_form.html.erb +2 -2
- data/app/views/administrate/application/{_icons.erb → _icons.html.erb} +0 -0
- data/app/views/administrate/application/_navigation.html.erb +5 -3
- data/app/views/administrate/application/index.html.erb +4 -2
- data/app/views/administrate/application/show.html.erb +2 -2
- data/app/views/fields/belongs_to/_form.html.erb +3 -3
- data/app/views/fields/date/_form.html.erb +24 -0
- data/app/views/fields/date/_index.html.erb +21 -0
- data/app/views/fields/date/_show.html.erb +21 -0
- data/app/views/fields/has_many/_form.html.erb +2 -2
- data/app/views/fields/has_many/_show.html.erb +8 -5
- data/app/views/fields/has_one/_form.html.erb +1 -1
- data/app/views/fields/has_one/_index.html.erb +1 -1
- data/app/views/fields/has_one/_show.html.erb +4 -4
- data/app/views/fields/number/_form.html.erb +1 -1
- data/app/views/fields/polymorphic/_form.html.erb +0 -3
- data/app/views/fields/polymorphic/_show.html.erb +1 -1
- data/app/views/fields/select/_form.html.erb +22 -10
- data/app/views/fields/string/_show.html.erb +2 -2
- data/app/views/fields/text/_show.html.erb +2 -3
- data/app/views/fields/time/_form.html.erb +3 -2
- data/app/views/fields/time/_index.html.erb +3 -1
- data/app/views/fields/time/_show.html.erb +3 -1
- data/app/views/fields/url/_form.html.erb +23 -0
- data/app/views/fields/url/_index.html.erb +20 -0
- data/app/views/fields/url/_show.html.erb +20 -0
- data/app/views/layouts/administrate/application.html.erb +2 -1
- data/config/locales/administrate.ar.yml +2 -0
- data/config/locales/administrate.bs.yml +2 -0
- data/config/locales/administrate.ca.yml +2 -0
- data/config/locales/administrate.da.yml +2 -0
- data/config/locales/administrate.de.yml +2 -0
- data/config/locales/administrate.en.yml +2 -0
- data/config/locales/administrate.es.yml +3 -1
- data/config/locales/administrate.fi.yml +30 -0
- data/config/locales/administrate.fr.yml +4 -2
- data/config/locales/administrate.id.yml +30 -0
- data/config/locales/administrate.it.yml +2 -0
- data/config/locales/administrate.ja.yml +2 -0
- data/config/locales/administrate.ko.yml +12 -10
- data/config/locales/administrate.nl.yml +7 -5
- data/config/locales/administrate.pl.yml +2 -0
- data/config/locales/administrate.pt-BR.yml +4 -2
- data/config/locales/administrate.pt.yml +4 -2
- data/config/locales/administrate.ru.yml +2 -0
- data/config/locales/{administrate.al.yml → administrate.sq.yml} +3 -1
- data/config/locales/administrate.sv.yml +2 -0
- data/config/locales/administrate.tr.yml +30 -0
- data/config/locales/administrate.uk.yml +2 -0
- data/config/locales/administrate.vi.yml +2 -0
- data/config/locales/administrate.zh-CN.yml +4 -2
- data/config/locales/administrate.zh-TW.yml +6 -4
- data/config/unicorn.rb +8 -13
- data/docs/adding_controllers_without_related_model.md +54 -0
- data/docs/adding_custom_field_types.md +3 -1
- data/docs/authentication.md +3 -1
- data/docs/authorization.md +5 -3
- data/docs/customizing_attribute_partials.md +5 -2
- data/docs/customizing_controller_actions.md +32 -2
- data/docs/customizing_dashboards.md +74 -34
- data/docs/customizing_page_views.md +18 -4
- data/docs/extending_administrate.md +27 -0
- data/docs/getting_started.md +49 -56
- data/docs/guides.md +5 -0
- data/docs/guides/hiding_dashboards_from_sidebar.md +19 -0
- data/docs/rails_api.md +45 -0
- data/lib/administrate.rb +19 -0
- data/lib/administrate/base_dashboard.rb +35 -9
- data/lib/administrate/custom_dashboard.rb +15 -0
- data/lib/administrate/engine.rb +8 -1
- data/lib/administrate/field/associative.rb +49 -5
- data/lib/administrate/field/base.rb +35 -9
- data/lib/administrate/field/belongs_to.rb +13 -3
- data/lib/administrate/field/date.rb +20 -0
- data/lib/administrate/field/deferred.rb +22 -3
- data/lib/administrate/field/has_many.rb +31 -11
- data/lib/administrate/field/has_one.rb +32 -12
- data/lib/administrate/field/number.rb +19 -2
- data/lib/administrate/field/polymorphic.rb +5 -5
- data/lib/administrate/field/select.rb +6 -1
- data/lib/administrate/field/url.rb +21 -0
- data/lib/administrate/namespace.rb +4 -0
- data/lib/administrate/order.rb +17 -7
- data/lib/administrate/page/base.rb +9 -3
- data/lib/administrate/page/collection.rb +5 -1
- data/lib/administrate/page/form.rb +1 -1
- data/lib/administrate/resource_resolver.rb +1 -1
- data/lib/administrate/search.rb +107 -23
- data/lib/administrate/version.rb +1 -1
- data/lib/administrate/view_generator.rb +9 -3
- data/lib/generators/administrate/dashboard/dashboard_generator.rb +21 -15
- data/lib/generators/administrate/dashboard/templates/controller.rb.erb +33 -8
- data/lib/generators/administrate/dashboard/templates/dashboard.rb.erb +18 -6
- data/lib/generators/administrate/install/install_generator.rb +37 -1
- data/lib/generators/administrate/install/templates/application_controller.rb.erb +3 -3
- data/lib/generators/administrate/routes/routes_generator.rb +21 -26
- data/lib/generators/administrate/views/layout_generator.rb +1 -0
- data/lib/generators/administrate/views/views_generator.rb +5 -4
- metadata +50 -53
- data/app/assets/javascripts/administrate/components/has_many_form.js +0 -3
- data/config/secrets.yml +0 -14
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
<%#
|
|
2
|
+
# Url Show Partial
|
|
3
|
+
|
|
4
|
+
This partial renders an email address,
|
|
5
|
+
to be displayed on a resource's show page.
|
|
6
|
+
|
|
7
|
+
By default, the value is rendered as an `a` element.
|
|
8
|
+
|
|
9
|
+
## Local variables:
|
|
10
|
+
|
|
11
|
+
- `field`:
|
|
12
|
+
An instance of [Administrate::Field::Url][1].
|
|
13
|
+
A wrapper around the email pulled from the database.
|
|
14
|
+
|
|
15
|
+
[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Url
|
|
16
|
+
%>
|
|
17
|
+
|
|
18
|
+
<%= content_tag :a, href: field.data do %>
|
|
19
|
+
<%= field.data %>
|
|
20
|
+
<% end %>
|
|
@@ -19,10 +19,11 @@ By default, it renders:
|
|
|
19
19
|
<meta name="ROBOTS" content="NOODP">
|
|
20
20
|
<meta name="viewport" content="initial-scale=1">
|
|
21
21
|
<title>
|
|
22
|
-
<%= content_for(:title) %> - <%=
|
|
22
|
+
<%= content_for(:title) %> - <%= application_title %>
|
|
23
23
|
</title>
|
|
24
24
|
<%= render "stylesheet" %>
|
|
25
25
|
<%= csrf_meta_tags %>
|
|
26
|
+
<%= csp_meta_tag if defined?(csp_meta_tag) %>
|
|
26
27
|
</head>
|
|
27
28
|
<body>
|
|
28
29
|
<%= render "icons" %>
|
|
@@ -22,7 +22,9 @@ es:
|
|
|
22
22
|
none: Ninguno
|
|
23
23
|
form:
|
|
24
24
|
error: error
|
|
25
|
-
errors: "%{pluralized_errors}
|
|
25
|
+
errors: "%{pluralized_errors} no permitieron guardar este %{resource_name}:"
|
|
26
|
+
navigation:
|
|
27
|
+
back_to_app: Regresar a la aplicación
|
|
26
28
|
search:
|
|
27
29
|
clear: Borrar búsqueda
|
|
28
30
|
label: Buscar %{resource}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
---
|
|
2
|
+
fi:
|
|
3
|
+
administrate:
|
|
4
|
+
actions:
|
|
5
|
+
confirm: Oletko varma?
|
|
6
|
+
destroy: Poista
|
|
7
|
+
edit: Muokkaa
|
|
8
|
+
edit_resource: Muokkaa %{name}
|
|
9
|
+
show_resource: Näytä %{name}
|
|
10
|
+
new_resource: Uusi %{name}
|
|
11
|
+
back: Takaisin
|
|
12
|
+
controller:
|
|
13
|
+
create:
|
|
14
|
+
success: "%{resource} luotiin onnistuneesti."
|
|
15
|
+
destroy:
|
|
16
|
+
success: "%{resource} poistettiin onnistuneesti."
|
|
17
|
+
update:
|
|
18
|
+
success: "%{resource} päivitettiin onnistuneesti."
|
|
19
|
+
fields:
|
|
20
|
+
has_many:
|
|
21
|
+
more: Näytetään %{count}/%{total_count}
|
|
22
|
+
none: Ei yhtään
|
|
23
|
+
form:
|
|
24
|
+
error: virhe
|
|
25
|
+
errors: "%{pluralized_errors} estivät tätä %{resource_name} tallentumasta:"
|
|
26
|
+
navigation:
|
|
27
|
+
back_to_app: Takaisin sovellukseen
|
|
28
|
+
search:
|
|
29
|
+
clear: Tyhjennä haku
|
|
30
|
+
label: Etsi %{resource}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
fr:
|
|
3
3
|
administrate:
|
|
4
4
|
actions:
|
|
5
|
-
confirm: Êtes-vous sûr ?
|
|
5
|
+
confirm: Êtes-vous sûr(e) ?
|
|
6
6
|
destroy: Supprimer
|
|
7
7
|
edit: Modifier
|
|
8
8
|
edit_resource: Modifier %{name}
|
|
@@ -22,7 +22,9 @@ fr:
|
|
|
22
22
|
none: Aucun
|
|
23
23
|
form:
|
|
24
24
|
error: erreur
|
|
25
|
-
errors: "%{pluralized_errors} ont
|
|
25
|
+
errors: "%{pluralized_errors} ont empêché %{resource_name} d'être sauvegardé(e) :"
|
|
26
|
+
navigation:
|
|
27
|
+
back_to_app: Retour à l'application
|
|
26
28
|
search:
|
|
27
29
|
clear: Effacer la recherche
|
|
28
30
|
label: Chercher %{resource}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
---
|
|
2
|
+
id:
|
|
3
|
+
administrate:
|
|
4
|
+
actions:
|
|
5
|
+
confirm: Anda yakin?
|
|
6
|
+
destroy: Hapus
|
|
7
|
+
edit: Perbarui
|
|
8
|
+
edit_resource: Perbarui %{name}
|
|
9
|
+
show_resource: Tampilkan %{name}
|
|
10
|
+
new_resource: "%{name} baru"
|
|
11
|
+
back: Kembali
|
|
12
|
+
controller:
|
|
13
|
+
create:
|
|
14
|
+
success: "%{resource} telah berhasil dibuat."
|
|
15
|
+
destroy:
|
|
16
|
+
success: "%{resource} telah berhasil dihapus."
|
|
17
|
+
update:
|
|
18
|
+
success: "%{resource} telah berhasil diperbarui."
|
|
19
|
+
fields:
|
|
20
|
+
has_many:
|
|
21
|
+
more: Menampilkan %{count} dari %{total_count}
|
|
22
|
+
none: Kosong
|
|
23
|
+
form:
|
|
24
|
+
error: error
|
|
25
|
+
errors: "%{pluralized_errors} membuat %{resource_name} tidak bisa tersimpan:"
|
|
26
|
+
navigation:
|
|
27
|
+
back_to_app: Kembali ke aplikasi
|
|
28
|
+
search:
|
|
29
|
+
clear: Kosongkan pencarian
|
|
30
|
+
label: Cari %{resource}
|
|
@@ -4,25 +4,27 @@ ko:
|
|
|
4
4
|
actions:
|
|
5
5
|
confirm: 괜찮습니까?
|
|
6
6
|
destroy: 삭제
|
|
7
|
-
edit:
|
|
8
|
-
edit_resource:
|
|
9
|
-
show_resource:
|
|
10
|
-
new_resource:
|
|
7
|
+
edit: 수정
|
|
8
|
+
edit_resource: 수정 %{name}
|
|
9
|
+
show_resource: "%{name}"
|
|
10
|
+
new_resource: 새 %{name}
|
|
11
11
|
back: 뒤로
|
|
12
12
|
controller:
|
|
13
13
|
create:
|
|
14
|
-
success: "%{resource}
|
|
14
|
+
success: "%{resource}가 성공적으로 생성되었습니다."
|
|
15
15
|
destroy:
|
|
16
|
-
success: "%{resource}
|
|
16
|
+
success: "%{resource}가 성공적으로 삭제되었습니다."
|
|
17
17
|
update:
|
|
18
|
-
success: "%{resource}
|
|
18
|
+
success: "%{resource}가 성공적으로 수정되었습니다."
|
|
19
19
|
fields:
|
|
20
20
|
has_many:
|
|
21
|
-
more: "%{total_count}
|
|
21
|
+
more: "%{total_count}개 중에서 %{count}개"
|
|
22
22
|
none: 없음
|
|
23
23
|
form:
|
|
24
|
-
error:
|
|
25
|
-
errors: "%{pluralized_errors}
|
|
24
|
+
error: 에러
|
|
25
|
+
errors: "%{pluralized_errors}로 인하여 %{resource_name}을(를) 저장하는데 실패하였습니다."
|
|
26
|
+
navigation:
|
|
27
|
+
back_to_app: 앱으로 돌아 가기
|
|
26
28
|
search:
|
|
27
29
|
clear: 검색 초기화
|
|
28
30
|
label: "%{resource} 검색"
|
|
@@ -11,18 +11,20 @@ nl:
|
|
|
11
11
|
back: Terug
|
|
12
12
|
controller:
|
|
13
13
|
create:
|
|
14
|
-
success: "%{resource}
|
|
14
|
+
success: "%{resource} is succesvol aangemaakt."
|
|
15
15
|
destroy:
|
|
16
|
-
success: "%{resource}
|
|
16
|
+
success: "%{resource} is succesvol verwijderd."
|
|
17
17
|
update:
|
|
18
|
-
success: "%{resource}
|
|
18
|
+
success: "%{resource} is succesvol geupdated."
|
|
19
19
|
fields:
|
|
20
20
|
has_many:
|
|
21
21
|
more: Resultaat %{count} van %{total_count}
|
|
22
22
|
none: Geen
|
|
23
23
|
form:
|
|
24
24
|
error: error
|
|
25
|
-
errors: "%{pluralized_errors}
|
|
25
|
+
errors: "%{pluralized_errors} maakten het onmogelijk %{resource_name} op:"
|
|
26
|
+
navigation:
|
|
27
|
+
back_to_app: Terug naar app
|
|
26
28
|
search:
|
|
27
|
-
clear:
|
|
29
|
+
clear: Wissen
|
|
28
30
|
label: Zoeken %{resource}
|
|
@@ -22,8 +22,10 @@ pt-BR:
|
|
|
22
22
|
more: "Exibindo %{count} de %{total_count}"
|
|
23
23
|
none: Nenhum
|
|
24
24
|
form:
|
|
25
|
-
error:
|
|
26
|
-
errors: "%{pluralized_errors}
|
|
25
|
+
error: erro
|
|
26
|
+
errors: "%{pluralized_errors} impediram %{resource_name} de ser gravado:"
|
|
27
|
+
navigation:
|
|
28
|
+
back_to_app: Voltar ao aplicativo
|
|
27
29
|
search:
|
|
28
30
|
clear: Limpar pesquisa
|
|
29
31
|
label: Pesquisa %{resource}
|
|
@@ -22,8 +22,10 @@ pt:
|
|
|
22
22
|
more: "Mostrando %{count} de %{total_count}"
|
|
23
23
|
none: Nenhum
|
|
24
24
|
form:
|
|
25
|
-
error:
|
|
26
|
-
errors: "%{pluralized_errors}
|
|
25
|
+
error: erro
|
|
26
|
+
errors: "%{pluralized_errors} impediram %{resource_name} de ser gravado:"
|
|
27
|
+
navigation:
|
|
28
|
+
back_to_app: Voltar à aplicação
|
|
27
29
|
search:
|
|
28
30
|
clear: Limpar pesquisa
|
|
29
31
|
label: Pesquisa %{resource}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
---
|
|
2
|
-
|
|
2
|
+
sq:
|
|
3
3
|
administrate:
|
|
4
4
|
actions:
|
|
5
5
|
confirm: A jeni te sigurtë?
|
|
@@ -23,6 +23,8 @@ al:
|
|
|
23
23
|
form:
|
|
24
24
|
error: gabim
|
|
25
25
|
errors: "%{pluralized_errors} nuk e lejoj %{resource_name} të ruhet:"
|
|
26
|
+
navigation:
|
|
27
|
+
back_to_app: Kthehu tek aplikacioni
|
|
26
28
|
search:
|
|
27
29
|
clear: Pastro kërkimin
|
|
28
30
|
label: Kërko %{resource}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
---
|
|
2
|
+
tr:
|
|
3
|
+
administrate:
|
|
4
|
+
actions:
|
|
5
|
+
confirm: Emin misiniz?
|
|
6
|
+
destroy: Sil
|
|
7
|
+
edit: Düzenle
|
|
8
|
+
edit_resource: "%{name} Kaydını Düzenle"
|
|
9
|
+
show_resource: "%{name} Kaydını Göster"
|
|
10
|
+
new_resource: Yeni %{name}
|
|
11
|
+
back: Geri
|
|
12
|
+
controller:
|
|
13
|
+
create:
|
|
14
|
+
success: "%{resource} kaydı başarıyla yaratıldı."
|
|
15
|
+
destroy:
|
|
16
|
+
success: "%{resource} kaydı başarıyla silindi."
|
|
17
|
+
update:
|
|
18
|
+
success: "%{resource} kaydı başarıyla düzenlendi."
|
|
19
|
+
fields:
|
|
20
|
+
has_many:
|
|
21
|
+
more: Toplam %{total_count} kayıttan %{count} adedi gösteriliyor
|
|
22
|
+
none: Yok
|
|
23
|
+
form:
|
|
24
|
+
error: Hata
|
|
25
|
+
errors: "%{resource_name} kaydedilemedi: %{pluralized_errors}"
|
|
26
|
+
navigation:
|
|
27
|
+
back_to_app: Uygulamaya geri dön
|
|
28
|
+
search:
|
|
29
|
+
clear: Temizle
|
|
30
|
+
label: "%{resource} içerisinde ara"
|
|
@@ -21,8 +21,10 @@ zh-CN:
|
|
|
21
21
|
more: 显示所有 %{total_count} 中 %{count} 条
|
|
22
22
|
none: 无
|
|
23
23
|
form:
|
|
24
|
-
error:
|
|
25
|
-
errors: "%{
|
|
24
|
+
error: 错误
|
|
25
|
+
errors: "%{resource_name} 保存前出现了 %{pluralized_errors} 个错误："
|
|
26
|
+
navigation:
|
|
27
|
+
back_to_app: 返回应用
|
|
26
28
|
search:
|
|
27
29
|
clear: 清除搜索
|
|
28
30
|
label: 搜索 %{resource}
|
|
@@ -21,8 +21,10 @@ zh-TW:
|
|
|
21
21
|
more: 顯示 %{total_count} 筆中的 %{count} 筆資料
|
|
22
22
|
none: 無
|
|
23
23
|
form:
|
|
24
|
-
error:
|
|
25
|
-
errors: "%{pluralized_errors}
|
|
24
|
+
error: 錯誤
|
|
25
|
+
errors: "%{pluralized_errors} 導致此 %{resource_name} 不能被儲存："
|
|
26
|
+
navigation:
|
|
27
|
+
back_to_app: 返回应用
|
|
26
28
|
search:
|
|
27
|
-
clear:
|
|
28
|
-
label:
|
|
29
|
+
clear: 清除搜尋
|
|
30
|
+
label: 搜尋 %{resource}
|
data/config/unicorn.rb
CHANGED
|
@@ -1,30 +1,25 @@
|
|
|
1
1
|
# https://devcenter.heroku.com/articles/rails-unicorn
|
|
2
2
|
|
|
3
|
-
worker_processes (ENV["
|
|
4
|
-
timeout
|
|
3
|
+
worker_processes Integer(ENV["WEB_CONCURRENCY"] || 3)
|
|
4
|
+
timeout 15
|
|
5
5
|
preload_app true
|
|
6
6
|
|
|
7
7
|
before_fork do |_server, _worker|
|
|
8
8
|
Signal.trap "TERM" do
|
|
9
|
-
puts "Unicorn master intercepting TERM
|
|
9
|
+
puts "Unicorn master intercepting TERM and sending myself QUIT instead"
|
|
10
10
|
Process.kill "QUIT", Process.pid
|
|
11
11
|
end
|
|
12
12
|
|
|
13
|
-
|
|
13
|
+
defined?(ActiveRecord::Base) &&
|
|
14
14
|
ActiveRecord::Base.connection.disconnect!
|
|
15
|
-
end
|
|
16
15
|
end
|
|
17
16
|
|
|
18
17
|
after_fork do |_server, _worker|
|
|
19
18
|
Signal.trap "TERM" do
|
|
20
|
-
puts "Unicorn worker intercepting TERM
|
|
19
|
+
puts "Unicorn worker intercepting TERM and doing nothing. " \
|
|
20
|
+
"Wait for master to send QUIT"
|
|
21
21
|
end
|
|
22
22
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
Rails.application.config.database_configuration[Rails.env]
|
|
26
|
-
config["reaping_frequency"] = (ENV["DB_REAPING_FREQUENCY"] || 10).to_i
|
|
27
|
-
config["pool"] = (ENV["DB_POOL"] || 2).to_i
|
|
28
|
-
ActiveRecord::Base.establish_connection(config)
|
|
29
|
-
end
|
|
23
|
+
defined?(ActiveRecord::Base) &&
|
|
24
|
+
ActiveRecord::Base.establish_connection
|
|
30
25
|
end
|