administrate 0.13.0 → 0.17.0

data/app/views/fields/has_one/_show.html.erb

@@ -4,7 +4,7 @@
 This partial renders a has_one relationship,
 to be displayed on a resource's show page.
 
-All fields of has_one relationship would be rendered
+All show page attributes of has_one relationship would be rendered
 
 ## Local variables:
 
@@ -15,7 +15,7 @@ All fields of has_one relationship would be rendered
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/HasOne
 %>
 
-<% if field.data %>
+<% if field.linkable? %>
   <fieldset class="attribute--nested">
     <legend>
       <%= link_to(
@@ -23,7 +23,7 @@ All fields of has_one relationship would be rendered
         [namespace, field.data],
       ) %>
     </legend>
-    <% field.nested_form.attributes.each do |attribute| -%>
+    <% field.nested_show.attributes.each do |attribute| -%>
       <div>
       <dt class="attribute-label">
         <%= t(
@@ -32,7 +32,7 @@ All fields of has_one relationship would be rendered
         ) %>
       </dt>
       <dd class="attribute-data attribute-data--<%= attribute.html_class %>">
-        <%= attribute.data %>
+        <%= render_field attribute, { page: page } %>
       </dd>
       </div>
     <% end -%>

data/app/views/fields/number/_form.html.erb

@@ -19,5 +19,5 @@ By default, the input is a text field.
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.text_field field.attribute %>
+  <%= f.number_field field.attribute, step: "any" %>
 </div>

data/app/views/fields/polymorphic/_show.html.erb

@@ -17,7 +17,7 @@ By default, the relationship is rendered as a link to the associated object.
 %>
 
 <% if field.data %>
-  <% if valid_action?(:show, field.attribute) %>
+  <% if valid_action?(:show, field.data.class) %>
     <%= link_to(
       field.display_associated_resource,
       [namespace, field.data],

data/app/views/fields/select/_form.html.erb

@@ -19,13 +19,27 @@ to be displayed on a resource's edit form page.
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.select(
-    field.attribute,
-    options_from_collection_for_select(
-      field.selectable_options,
-      :to_s,
-      :to_s,
-      field.data.presence,
-    )
-  ) %>
+  <% if field.selectable_options.first&.is_a?(Array) %>
+    <%= f.select(
+      field.attribute,
+      options_from_collection_for_select(
+        field.selectable_options,
+        :last,
+        :first,
+        field.data,
+      ),
+      include_blank: field.include_blank_option
+    ) %>
+  <% else %>
+    <%= f.select(
+      field.attribute,
+      options_from_collection_for_select(
+        field.selectable_options,
+        :to_s,
+        :to_s,
+        field.data,
+      ),
+      include_blank: field.include_blank_option
+    ) %>
+  <% end %>
 </div>

data/app/views/fields/time/_form.html.erb

@@ -2,7 +2,7 @@
 # Time Form Partial
 
 This partial renders an input element for time attributes.
-By default, the input is a select field for the time attributes.
+By default, the input is a text field that is augmented with [DateTimePicker].
 
 ## Local variables:
 
@@ -12,11 +12,12 @@ By default, the input is a select field for the time attributes.
   An instance of [Administrate::Field::Time][1].
   A wrapper around the tmie attributes pulled from the model.
 
+[DateTimePicker]: https://github.com/Eonasdan/bootstrap-datetimepicker
 %>
 
 <div class="field-unit__label">
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.text_field field.attribute, data: { type: 'time' } %>
+  <%= f.text_field field.attribute, data: { type: 'time' }, value: field.data&.strftime("%H:%M:%S") %>
 </div>

data/app/views/fields/time/_index.html.erb

@@ -14,4 +14,6 @@ By default, the attribute is rendered as a text tag.
 
 %>
 
-<%= field.data.strftime("%I:%M%p").to_s %>
+<% if field.data %>
+  <%= field.time %>
+<% end %>

data/app/views/fields/time/_show.html.erb

@@ -14,4 +14,6 @@ By default, the attribute is rendered as a text tag.
 
 %>
 
-<%= field.data.strftime("%I:%M%p").to_s %>
+<% if field.data %>
+  <%= field.time %>
+<% end %>

data/app/views/fields/url/_index.html.erb

@@ -1,7 +1,7 @@
 <%#
 # Url Index Partial
 
-This partial renders an email address,
+This partial renders a URL address,
 to be displayed on a resource's index page.
 
 By default, the value is rendered as an `a` element.

data/app/views/fields/url/_show.html.erb

@@ -1,7 +1,7 @@
 <%#
 # Url Show Partial
 
-This partial renders an email address,
+This partial renders a URL address,
 to be displayed on a resource's show page.
 
 By default, the value is rendered as an `a` element.

data/app/views/layouts/administrate/application.html.erb

@@ -23,6 +23,7 @@ By default, it renders:
   </title>
   <%= render "stylesheet" %>
   <%= csrf_meta_tags %>
+  <%= csp_meta_tag if defined?(csp_meta_tag) %>
 </head>
 <body>
   <%= render "icons" %>

data/config/locales/administrate.ar.yml

@@ -23,6 +23,8 @@ ar:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: العودة إلى التطبيق
     search:
       clear: مسح البحث
       label: بحث %{resource}

data/config/locales/administrate.bs.yml

@@ -22,6 +22,8 @@ bs:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Natrag na aplikaciju
     search:
       clear: Izbriši pretraživanje
       label: Pretraga %{resource}

data/config/locales/administrate.ca.yml

@@ -23,6 +23,8 @@ ca:
     form:
       error: error
       errors: "%{pluralized_errors} han impedit que %{resource_name} es guardés amb èxit:"
+    navigation:
+      back_to_app: Torna a l'aplicació
     search:
       clear: Esborrar la cerca
       label: Cerca %{resource}

data/config/locales/administrate.da.yml

@@ -23,6 +23,8 @@ da:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Tilbage til app
     search:
       clear: Ryd søgning
       label: Søg %{resource}

data/config/locales/administrate.de.yml

@@ -23,6 +23,8 @@ de:
     form:
       error: error
       errors: "%{pluralized_errors} haben das Speichern dieses %{resource_name} verhindert:"
+    navigation:
+      back_to_app: Zurück zur App
     search:
       clear: Suche zurücksetzen
       label: "%{resource} durchsuchen"

data/config/locales/administrate.en.yml

@@ -23,6 +23,8 @@ en:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Back to app
     search:
       clear: Clear search
       label: Search %{resource}

data/config/locales/administrate.es.yml

@@ -23,6 +23,8 @@ es:
     form:
       error: error
       errors: "%{pluralized_errors} no permitieron guardar este %{resource_name}:"
+    navigation:
+      back_to_app: Regresar a la aplicación
     search:
       clear: Borrar búsqueda
       label: Buscar %{resource}

data/config/locales/administrate.fi.yml

@@ -0,0 +1,30 @@
+---
+fi:
+  administrate:
+    actions:
+      confirm: Oletko varma?
+      destroy: Poista
+      edit: Muokkaa
+      edit_resource: Muokkaa %{name}
+      show_resource: Näytä %{name}
+      new_resource: Uusi %{name}
+      back: Takaisin
+    controller:
+      create:
+        success: "%{resource} luotiin onnistuneesti."
+      destroy:
+        success: "%{resource} poistettiin onnistuneesti."
+      update:
+        success: "%{resource} päivitettiin onnistuneesti."
+    fields:
+      has_many:
+        more: Näytetään %{count}/%{total_count}
+        none: Ei yhtään
+    form:
+      error: virhe
+      errors: "%{pluralized_errors} estivät tätä %{resource_name} tallentumasta:"
+    navigation:
+      back_to_app: Takaisin sovellukseen
+    search:
+      clear: Tyhjennä haku
+      label: Etsi %{resource}

data/config/locales/administrate.fr.yml

@@ -2,7 +2,7 @@
 fr:
   administrate:
     actions:
-      confirm: Êtes-vous sûr ?
+      confirm: Êtes-vous sûr(e) ?
       destroy: Supprimer
       edit: Modifier
       edit_resource: Modifier %{name}
@@ -22,7 +22,9 @@ fr:
         none: Aucun
     form:
       error: erreur
-      errors: "%{pluralized_errors} ont empêchés %{resource_name} d'être sauvergardé :"
+      errors: "%{pluralized_errors} ont empêché %{resource_name} d'être sauvegardé(e) :"
+    navigation:
+      back_to_app: Retour à l'application
     search:
       clear: Effacer la recherche
       label: Chercher %{resource}

data/config/locales/administrate.id.yml

@@ -23,6 +23,8 @@ id:
     form:
       error: error
       errors: "%{pluralized_errors} membuat %{resource_name} tidak bisa tersimpan:"
+    navigation:
+      back_to_app: Kembali ke aplikasi
     search:
       clear: Kosongkan pencarian
       label: Cari %{resource}

data/config/locales/administrate.it.yml

@@ -23,6 +23,8 @@ it:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Torna all'app
     search:
       clear: Cancella ricerca
       label: Ricerca %{resource}

data/config/locales/administrate.ja.yml

@@ -23,6 +23,8 @@ ja:
     form:
       error: エラー
       errors: "%{pluralized_errors}のため%{resource_name}を保存できません。"
+    navigation:
+      back_to_app: アプリに戻る
     search:
       clear: 検索をクリアする
       label: サーチ %{resource}

data/config/locales/administrate.ko.yml

@@ -23,6 +23,8 @@ ko:
     form:
       error: 에러
       errors: "%{pluralized_errors}로 인하여 %{resource_name}을(를) 저장하는데 실패하였습니다."
+    navigation:
+      back_to_app: 앱으로 돌아 가기
     search:
       clear: 검색 초기화
       label: "%{resource} 검색"

data/config/locales/administrate.nl.yml

@@ -11,18 +11,20 @@ nl:
       back: Terug
     controller:
       create:
-        success: "%{resource} was succesvol aangemaakt."
+        success: "%{resource} is succesvol aangemaakt."
       destroy:
-        success: "%{resource} was succesvol verwijderd."
+        success: "%{resource} is succesvol verwijderd."
       update:
-        success: "%{resource} was succesvol geupdated."
+        success: "%{resource} is succesvol geupdated."
     fields:
       has_many:
         more: Resultaat %{count} van %{total_count}
         none: Geen
     form:
       error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      errors: "%{pluralized_errors} maakten het onmogelijk %{resource_name} op:"
+    navigation:
+      back_to_app: Terug naar app
     search:
-      clear: CDuidelijke zoek
+      clear: Wissen
       label: Zoeken %{resource}

data/config/locales/administrate.pl.yml

@@ -23,6 +23,8 @@ pl:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Powrót do aplikacji
     search:
       clear: Wyczyść wyszukiwanie
       label: Szukanie %{resource}

data/config/locales/administrate.pt-BR.yml

@@ -22,8 +22,10 @@ pt-BR:
         more: "Exibindo %{count} de %{total_count}"
         none: Nenhum
     form:
-      error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      error: erro
+      errors: "%{pluralized_errors} impediram %{resource_name} de ser gravado:"
+    navigation:
+      back_to_app: Voltar ao aplicativo
     search:
       clear: Limpar pesquisa
       label: Pesquisa %{resource}

data/config/locales/administrate.pt.yml

@@ -22,8 +22,10 @@ pt:
         more: "Mostrando %{count} de %{total_count}"
         none: Nenhum
     form:
-      error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      error: erro
+      errors: "%{pluralized_errors} impediram %{resource_name} de ser gravado:"
+    navigation:
+      back_to_app: Voltar à aplicação
     search:
       clear: Limpar pesquisa
       label: Pesquisa %{resource}

data/config/locales/administrate.ru.yml

@@ -23,6 +23,8 @@ ru:
     form:
       error: Ошибка
       errors: "При сохранении %{resource_name} произошли ошибки:"
+    navigation:
+      back_to_app: Вернуться в приложение
     search:
       clear: Очистить поиск
       label: Поиск %{resource}

data/config/locales/{administrate.al.yml → administrate.sq.yml}

@@ -1,5 +1,5 @@
 ---
-al:
+sq:
   administrate:
     actions:
       confirm: A jeni te sigurtë?
@@ -23,6 +23,8 @@ al:
     form:
       error: gabim
       errors: "%{pluralized_errors} nuk e lejoj %{resource_name} të ruhet:"
+    navigation:
+      back_to_app: Kthehu tek aplikacioni
     search:
       clear: Pastro kërkimin
       label: Kërko %{resource}

data/config/locales/administrate.sv.yml

@@ -23,6 +23,8 @@ sv:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Tillbaka till appen
     search:
       clear: Rensa sökningen
       label: Sök %{resource}

data/config/locales/administrate.tr.yml

@@ -0,0 +1,30 @@
+---
+tr:
+  administrate:
+    actions:
+      confirm: Emin misiniz?
+      destroy: Sil
+      edit: Düzenle
+      edit_resource: "%{name} Kaydını Düzenle"
+      show_resource: "%{name} Kaydını Göster"
+      new_resource: Yeni %{name}
+      back: Geri
+    controller:
+      create:
+        success: "%{resource} kaydı başarıyla yaratıldı."
+      destroy:
+        success: "%{resource} kaydı başarıyla silindi."
+      update:
+        success: "%{resource} kaydı başarıyla düzenlendi."
+    fields:
+      has_many:
+        more: Toplam %{total_count} kayıttan %{count} adedi gösteriliyor
+        none: Yok
+    form:
+      error: Hata
+      errors: "%{resource_name} kaydedilemedi: %{pluralized_errors}"
+    navigation:
+      back_to_app: Uygulamaya geri dön
+    search:
+      clear: Temizle
+      label: "%{resource} içerisinde ara"

data/config/locales/administrate.uk.yml

@@ -23,6 +23,8 @@ uk:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Повернутися до програми
     search:
       clear: Очистити пошук
       label: пошук %{resource}

data/config/locales/administrate.vi.yml

@@ -23,6 +23,8 @@ vi:
     form:
       error: error
       errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+    navigation:
+      back_to_app: Quay lại ứng dụng
     search:
       clear: Tìm kiếm rõ ràng
       label: Tìm kiếm %{resource}

data/config/locales/administrate.zh-CN.yml

@@ -23,6 +23,8 @@ zh-CN:
     form:
       error: 错误
       errors: "%{resource_name} 保存前出现了 %{pluralized_errors} 个错误："
+    navigation:
+      back_to_app: 返回应用
     search:
       clear: 清除搜索
       label: 搜索 %{resource}

data/config/locales/administrate.zh-TW.yml

@@ -23,6 +23,8 @@ zh-TW:
     form:
       error: 錯誤
       errors: "%{pluralized_errors} 導致此 %{resource_name} 不能被儲存："
+    navigation:
+      back_to_app: 返回首頁
     search:
       clear: 清除搜尋
       label: 搜尋 %{resource}

data/config/unicorn.rb

@@ -1,30 +1,25 @@
 # https://devcenter.heroku.com/articles/rails-unicorn
 
-worker_processes (ENV["UNICORN_WORKERS"] || 3).to_i
-timeout (ENV["UNICORN_TIMEOUT"] || 15).to_i
+worker_processes Integer(ENV["WEB_CONCURRENCY"] || 3)
+timeout 15
 preload_app true
 
 before_fork do |_server, _worker|
   Signal.trap "TERM" do
-    puts "Unicorn master intercepting TERM, sending myself QUIT instead"
+    puts "Unicorn master intercepting TERM and sending myself QUIT instead"
     Process.kill "QUIT", Process.pid
   end
 
-  if defined? ActiveRecord::Base
+  defined?(ActiveRecord::Base) &&
     ActiveRecord::Base.connection.disconnect!
-  end
 end
 
 after_fork do |_server, _worker|
   Signal.trap "TERM" do
-    puts "Unicorn worker intercepting TERM, waiting for master to send QUIT"
+    puts "Unicorn worker intercepting TERM and doing nothing. " \
+      "Wait for master to send QUIT"
   end
 
-  if defined? ActiveRecord::Base
-    config = ActiveRecord::Base.configurations[Rails.env] ||
-      Rails.application.config.database_configuration[Rails.env]
-    config["reaping_frequency"] = (ENV["DB_REAPING_FREQUENCY"] || 10).to_i
-    config["pool"] = (ENV["DB_POOL"] || 2).to_i
-    ActiveRecord::Base.establish_connection(config)
-  end
+  defined?(ActiveRecord::Base) &&
+    ActiveRecord::Base.establish_connection
 end

data/docs/adding_controllers_without_related_model.md

@@ -0,0 +1,52 @@
+---
+title: Adding Controllers without a related Model
+---
+
+Sometimes you may want to add a custom controller that has no resource
+related to it (for example for a statistics page).
+
+To do that, you must define an `index` route, as only controllers with index
+routes are displayed in the sidebar and then add a custom dashboard:
+
+```erb
+# app/views/admin/stats/index.html.erb 
+
+<div style="padding: 20px">
+  <h1>Stats</h1>
+  <br>
+  <p><b>Total Customers:</b> <%= @stats[:customer_count] %></h1>
+  <br>
+  <p><b>Total Orders:</b> <%= @stats[:order_count] %></h1>
+</div>
+```
+
+```ruby
+# app/dashboards/stat_dashboard.rb
+require "administrate/custom_dashboard"
+
+class StatDashboard < Administrate::CustomDashboard
+  resource "Stats" # used by administrate in the views
+end
+```
+
+```ruby
+# app/controllers/admin/stats_controller.rb
+module Admin
+  class StatsController < Admin::ApplicationController
+    def index
+      @stats = {
+        customer_count: Customer.count,
+        order_count: Order.count,
+      }
+    end
+  end
+end
+```
+
+```ruby
+# config/routes.rb
+namespace :admin do
+  # ...
+  resources :stats, only: [:index]
+end
+```

data/docs/customizing_controller_actions.md

@@ -56,3 +56,35 @@ end
 ```
 
 Action is one of `new`, `edit`, `show`, `destroy`.
+
+## Customizing Default Sorting
+
+To set the default sorting on the index action you could override `default_sorting_attribute` or `default_sorting_direction` in your dashboard controller like this:
+
+```ruby
+def default_sorting_attribute
+  :age
+end
+
+def default_sorting_direction
+  :desc
+end
+```
+
+## Customizing Redirects after actions
+
+To set custom redirects after the actions `create`, `update` and `destroy` you can override `after_resource_created_path`, `after_resource_updated_path` or `after_resource_destroyed_path` like this:
+
+```ruby
+    def after_resource_destroyed_path(_requested_resource)
+      { action: :index, controller: :some_other_resource }
+    end
+
+    def after_resource_created_path(requested_resource)
+      [namespace, requested_resource.some_other_resource]
+    end
+
+    def after_resource_updated_path(requested_resource)
+      [namespace, requested_resource.some_other_resource]
+    end
+```