administrate 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8120deb0ddc3a88302230382298ce39c25d60e4effca6336787016c46024d91
-  data.tar.gz: ad6262c38fca6d8be885d8687db7b02444da05c751c8dcb25a71d7a292d43f05
+  metadata.gz: bb407c439ba3795c3161109f57d64a8e20db553d80f583c6d2a66bfe0f713cd7
+  data.tar.gz: 1691010813773e6ecc19b067adb4a610c6624f2ec2d8a03bb6414a683d5d83b0
 SHA512:
-  metadata.gz: e6bfde68398c548cfe04665c21c5e44fd8f659c404ddfcb141c5b358396cb6d0ca1c087b459a322553ff9dfeb195f033d817829d7a84bc80024004f1390faf5c
-  data.tar.gz: 794416e6cc50fadef9674c2fcb5316be67e7523d19c31431dfe3f80165a5355f3ce12019aad78681b6f5ede71797f3b3bab9b911236e8f3231bd0fcdacd15bc2
+  metadata.gz: 0fc7042ed3389b1cf87a4ba41681e310dc3678e790a5af0d3c3e3d64c213f50b5bf66409069159a18e784c9cdaf5e6d60e2d2614f4647b5ab0d8e0b4e2f6b70e
+  data.tar.gz: 1c8b66a38eca96f2002ccd8b253b4fc7abd082e7376111e2e1be399b870755ce29511982828760fd6a229f5571eb1ace83a9121fae2253db2653218ffbd237ce

data/app/assets/javascripts/administrate/components/associative.js

@@ -1,4 +1,5 @@
 $(function() {
   $('.field-unit--belongs-to select').selectize({});
   $(".field-unit--has-many select").selectize({});
+  $('.field-unit--polymorphic select').selectize({});
 });

data/app/assets/stylesheets/administrate/components/_attributes.scss

@@ -5,7 +5,7 @@
   margin-bottom: $base-spacing;
   margin-top: 0.25em;
   text-align: right;
-  width: calc(15% - 1rem);
+  width: calc(20% - 1rem);
 }
 
 .preserve-whitespace {
@@ -17,7 +17,8 @@
   float: left;
   margin-bottom: $base-spacing;
   margin-left: 2rem;
-  width: calc(85% - 1rem);
+  width: calc(80% - 1rem);
+  word-break: break-word;
 }
 
 .attribute--nested {

data/app/assets/stylesheets/administrate/components/_field-unit.scss

@@ -19,6 +19,10 @@
   margin-left: 2rem;
   max-width: 50rem;
   width: 100%;
+
+  .optgroup-header {
+    font-weight: $bold-font-weight;
+  }
 }
 
 .field-unit--nested {

data/app/assets/stylesheets/administrate/components/_main-content.scss

@@ -5,6 +5,7 @@
               0 2px 2px rgba($black, 0.2);
   flex: 1 1 100%;
   padding-bottom: 10vh;
+  min-width: 800px;
 }
 
 .main-content__header,

data/app/controllers/administrate/application_controller.rb

@@ -3,13 +3,14 @@ module Administrate
     protect_from_forgery with: :exception
 
     def index
+      authorize_resource(resource_class)
       search_term = params[:search].to_s.strip
       resources = Administrate::Search.new(scoped_resource,
                                            dashboard_class,
                                            search_term).run
       resources = apply_collection_includes(resources)
       resources = order.apply(resources)
-      resources = resources.page(params[:page]).per(records_per_page)
+      resources = resources.page(params[:_page]).per(records_per_page)
       page = Administrate::Page::Collection.new(dashboard, order: order)
 
       render locals: {
@@ -52,7 +53,7 @@ module Administrate
       else
         render :new, locals: {
           page: Administrate::Page::Form.new(dashboard, resource),
-        }
+        }, status: :unprocessable_entity
       end
     end
 
@@ -65,7 +66,7 @@ module Administrate
       else
         render :edit, locals: {
           page: Administrate::Page::Form.new(dashboard, requested_resource),
-        }
+        }, status: :unprocessable_entity
       end
     end
 
@@ -105,10 +106,7 @@ module Administrate
     end
 
     def sorting_attribute
-      params.fetch(resource_name, {}).fetch(
-        :order,
-        default_sorting_attribute,
-      )
+      sorting_params.fetch(:order) { default_sorting_attribute }
     end
 
     def default_sorting_attribute
@@ -116,16 +114,17 @@ module Administrate
     end
 
     def sorting_direction
-      params.fetch(resource_name, {}).fetch(
-        :direction,
-        default_sorting_direction,
-      )
+      sorting_params.fetch(:direction) { default_sorting_direction }
     end
 
     def default_sorting_direction
       nil
     end
 
+    def sorting_params
+      Hash.try_convert(request.query_parameters[resource_name]) || {}
+    end
+
     def dashboard
       @dashboard ||= dashboard_class.new
     end
@@ -174,6 +173,7 @@ module Administrate
       to: :resource_resolver
     helper_method :namespace
     helper_method :resource_name
+    helper_method :resource_class
 
     def resource_resolver
       @resource_resolver ||=

data/app/helpers/administrate/application_helper.rb

@@ -1,6 +1,7 @@
 module Administrate
   module ApplicationHelper
     PLURAL_MANY_COUNT = 2.1
+    SINGULAR_COUNT = 1
 
     def application_title
       if Rails::VERSION::MAJOR <= 5
@@ -16,22 +17,7 @@ module Administrate
     end
 
     def requireness(field)
-      required_field?(field) ? "required" : "optional"
-    end
-
-    def required_field?(field)
-      has_presence_validator?(field.resource.class, field.attribute)
-    end
-
-    def has_presence_validator?(resource_class, field_name)
-      validators_on(resource_class, field_name).
-        any? { |v| v.class == ActiveRecord::Validations::PresenceValidator }
-    end
-
-    def validators_on(resource_class, field_name)
-      return [] unless resource_class.respond_to?(:validators_on)
-
-      resource_class.validators_on(field_name)
+      field.required? ? "required" : "optional"
     end
 
     def dashboard_from_resource(resource_name)
@@ -43,10 +29,10 @@ module Administrate
       dashboard.try(:model) || resource_name.to_sym
     end
 
-    def display_resource_name(resource_name)
+    def display_resource_name(resource_name, opts = {})
       dashboard_from_resource(resource_name).resource_name(
-        count: PLURAL_MANY_COUNT,
-        default: default_resource_name(resource_name),
+        count: opts[:singular] ? SINGULAR_COUNT : PLURAL_MANY_COUNT,
+        default: default_resource_name(resource_name, opts),
       )
     end
 
@@ -70,19 +56,20 @@ module Administrate
       association_params = collection_names.map do |assoc_name|
         { assoc_name => %i[order direction page per_page] }
       end
-      params.permit(:search, :id, :page, :per_page, association_params)
+      params.permit(:search, :id, :_page, :per_page, association_params)
     end
 
     def clear_search_params
-      params.except(:search, :page).permit(
+      params.except(:search, :_page).permit(
         :per_page, resource_name => %i[order direction]
       )
     end
 
     private
 
-    def default_resource_name(resource_name)
-      resource_name.to_s.pluralize.gsub("/", "_").titleize
+    def default_resource_name(name, opts = {})
+      resource_name = (opts[:singular] ? name.to_s : name.to_s.pluralize)
+      resource_name.gsub("/", "_").titleize
     end
   end
 end

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

@@ -33,7 +33,7 @@ to display a collection of resources in an HTML table.
         )) do %>
         <%= t(
           "helpers.label.#{collection_presenter.resource_name}.#{attr_name}",
-          default: attr_name.to_s,
+          default: resource_class.human_attribute_name(attr_name),
         ).titleize %>
             <% if collection_presenter.ordered_by?(attr_name) %>
               <span class="cell-label__sort-indicator cell-label__sort-indicator--<%= collection_presenter.ordered_html_class(attr_name) %>">

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

@@ -21,7 +21,7 @@ and renders all form fields for a resource's editable attributes.
         <%= t(
           "administrate.form.errors",
           pluralized_errors: pluralize(page.resource.errors.count, t("administrate.form.error")),
-          resource_name: display_resource_name(page.resource_name).singularize
+          resource_name: display_resource_name(page.resource_name, singular: true)
         ) %>
       </h2>
 

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

@@ -44,7 +44,7 @@ It renders the `_table` partial to display details about the resources.
     <%= link_to(
       t(
         "administrate.actions.new_resource",
-        name: page.resource_name.titleize.downcase
+        name: display_resource_name(page.resource_name, singular: true).downcase
       ),
       [:new, namespace, page.resource_path],
       class: "button",
@@ -62,5 +62,5 @@ It renders the `_table` partial to display details about the resources.
     table_title: "page-title"
   ) %>
 
-  <%= paginate resources %>
+  <%= paginate resources, param_name: '_page' %>
 </section>

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

@@ -38,7 +38,7 @@ as well as a link to its edit page.
       <dt class="attribute-label" id="<%= attribute.name %>">
       <%= t(
         "helpers.label.#{resource_name}.#{attribute.name}",
-        default: attribute.name.titleize,
+        default: page.resource.class.human_attribute_name(attribute.name),
       ) %>
       </dt>
 

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

@@ -20,7 +20,7 @@ that displays all possible records to associate with.
   <%= f.label field.permitted_attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.select(field.permitted_attribute) do %>
-    <%= options_for_select(field.associated_resource_options, field.selected_option) %>
-  <% end %>
+  <%= f.select(field.permitted_attribute,
+               options_for_select(field.associated_resource_options, field.selected_option),
+               include_blank: field.include_blank_option) %>
 </div>

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

@@ -15,7 +15,7 @@ By default, the relationship is rendered as a link to the associated object.
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/HasOne
 %>
 
-<% if field.data %>
+<% if field.linkable? %>
   <%= link_to(
     field.display_associated_resource,
     [namespace, field.data],

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

@@ -26,7 +26,7 @@ to be displayed on a resource's edit form page.
         field.selectable_options,
         :last,
         :first,
-        field.data.presence,
+        field.data,
       )
     ) %>
   <% else %>
@@ -36,7 +36,7 @@ to be displayed on a resource's edit form page.
         field.selectable_options,
         :to_s,
         :to_s,
-        field.data.presence,
+        field.data,
       )
     ) %>
   <% end %>

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.data.strftime("%I:%M%p").to_s %>
+<% 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.data.strftime("%I:%M%p").to_s %>
+<% end %>

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.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,7 @@ 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:

data/config/locales/administrate.nl.yml

@@ -11,18 +11,18 @@ 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: