administrate 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d7d418391f23f99dc9c37e3ce7dc127a6cff9eb45f6994d9604f3771f4f51b4
-  data.tar.gz: cc2badcba457d79690e1ae05e2f03069ed1e13522a1a0f58ff2ad9b38ebc071d
+  metadata.gz: 11c705312ca68f68a80830fbe9088602b2d495fb4a4ee75ad86997a3ddb86c42
+  data.tar.gz: 8f56b485d373c66777ef5d535916953a57b0d5416019504ddc45d4a0d5fc37fa
 SHA512:
-  metadata.gz: a7e684f116a9d44b54d32fcf6c12865f61dcae3749366c253fdb4d9003c2930c18303d034f16c0273c174c035bc05b4524042e6d09124051a68af40eac8a6dc1
-  data.tar.gz: 4045bcd18584e285373a860c0f634f952aff238063a58862750fc5ad9988d8dac9e5bba18ce684be6d6b3a0a72ae3647f863d134cb756038fae7c5f5bd65e88c
+  metadata.gz: 3eefe2c7ff3dd30bcf5f58ee2bdfe8ad86645f6e34f1b8d0a6fd74094bedaff76c96c0526b839dca435a4e1acda2f71c8687aaae27b62be301a1d087420bdcb2
+  data.tar.gz: 5fb275186d046fd0daa165b994f84df4d4f944c56128e7c9309c9070e4d1e4a9ebecaf2d1c22b8d5677c8493bfcffda9414ecb819673ed8216bc9d74c745bd09

data/app/controllers/administrate/application_controller.rb

@@ -101,7 +101,10 @@ module Administrate
     end
 
     def order
-      @order ||= Administrate::Order.new(params[:order], params[:direction])
+      @order ||= Administrate::Order.new(
+        params.fetch(resource_name, {}).fetch(:order, nil),
+        params.fetch(resource_name, {}).fetch(:direction, nil),
+      )
     end
 
     def dashboard
@@ -165,7 +168,7 @@ module Administrate
 
     def show_search_bar?
       dashboard.attribute_types_for(
-        dashboard.collection_attributes,
+        dashboard.all_attributes,
       ).any? { |_name, attribute| attribute.searchable? }
     end
 

data/app/helpers/administrate/application_helper.rb

@@ -32,12 +32,18 @@ module Administrate
       ActiveModel::Naming.route_key(class_from_resource(resource_name))
     end
 
-    def sanitized_order_params
-      params.permit(:search, :id, :order, :page, :per_page, :direction, :orders)
+    def sanitized_order_params(page, current_field_name)
+      collection_names = page.association_includes + [current_field_name]
+      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)
     end
 
     def clear_search_params
-      params.except(:search, :page).permit(:order, :direction, :per_page)
+      params.except(:search, :page).permit(
+        :per_page, resource_name => %i[order direction]
+      )
     end
   end
 end

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

@@ -28,14 +28,13 @@ to display a collection of resources in an HTML table.
         scope="col"
         role="columnheader"
         aria-sort="<%= sort_order(collection_presenter.ordered_html_class(attr_name)) %>">
-        <%= link_to(sanitized_order_params.merge(
-          collection_presenter.order_params_for(attr_name)
+        <%= link_to(sanitized_order_params(page, collection_field_name).merge(
+          collection_presenter.order_params_for(attr_name, key: collection_field_name)
         )) do %>
         <%= t(
           "helpers.label.#{collection_presenter.resource_name}.#{attr_name}",
           default: attr_name.to_s,
         ).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) %>">
                 <svg aria-hidden="true">

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

@@ -56,6 +56,8 @@ It renders the `_table` partial to display details about the resources.
   <%= render(
     "collection",
     collection_presenter: page,
+    collection_field_name: resource_name,
+    page: page,
     resources: resources,
     table_title: "page-title"
   ) %>

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

@@ -43,7 +43,7 @@ as well as a link to its edit page.
       </dt>
 
       <dd class="attribute-data attribute-data--<%=attribute.html_class%>"
-          ><%= render_field attribute %></dd>
+          ><%= render_field attribute, page: page %></dd>
     <% end %>
   </dl>
 </section>

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

@@ -1,7 +1,7 @@
 <%#
 # HasMany Form Partial
 
-This partial renders an input element for belongs_to relationships.
+This partial renders an input element for has_many relationships.
 By default, the input is a collection select box
 that displays all possible records to associate with.
 The collection select box supports multiple inputs,
@@ -20,7 +20,7 @@ and is augmented with [Selectize].
 %>
 
 <div class="field-unit__label">
-  <%= f.label field.attribute_key, field.attribute %>
+  <%= f.label field.attribute, for: "#{f.object_name}_#{field.attribute_key}" %>
 </div>
 <div class="field-unit__field">
   <%= f.select(field.attribute_key, nil, {}, multiple: true) do %>

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

@@ -19,15 +19,18 @@ from the associated resource class's dashboard.
 %>
 
 <% if field.resources.any? %>
+  <% order = field.order_from_params(params.fetch(field.name, {})) %>
+  <% page_number = params.fetch(field.name, {}).fetch(:page, nil) %>
   <%= render(
     "collection",
-    collection_presenter: field.associated_collection,
-    resources: field.resources(params[field.name]),
-    table_title: field.name
+    collection_presenter: field.associated_collection(order),
+    collection_field_name: field.name,
+    page: page,
+    resources: field.resources(page_number, order),
+    table_title: field.name,
   ) %>
-
   <% if field.more_than_limit? %>
-    <%= paginate field.resources(params[field.name]), param_name: "#{field.name}" %>
+    <%= paginate field.resources(page_number), param_name: "#{field.name}[page]" %>
   <% end %>
 
 <% else %>

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

@@ -18,7 +18,7 @@ The form will be rendered as nested_from to parent relationship.
 
 <%= f.fields_for field.attribute, field.data || field.nested_form.resource.class.new do |has_one_f| %>
   <fieldset class="field-unit--nested">
-    <legend><%= field.nested_form.resource_name.titleize %></legend>
+    <legend><%= t "helpers.label.#{f.object_name}.#{field.nested_form.resource_name}", default: field.nested_form.resource_name.titleize %></legend>
     <% field.nested_form.attributes.each do |attribute| -%>
       <div class="field-unit field-unit--<%= attribute.html_class %>">
         <%= render_field attribute, f: has_one_f %>

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

@@ -3,9 +3,6 @@
 
 This partial renders an input element for polymorphic relationships.
 
-At the moment, polymorphic form fields are not supported,
-so this partial renders a message to that effect.
-
 ## Local variables:
 
 - `f`:

data/config/locales/administrate.id.yml

@@ -0,0 +1,28 @@
+---
+id:
+  administrate:
+    actions:
+      confirm: Anda yakin?
+      destroy: Hapus
+      edit: Perbarui
+      edit_resource: Perbarui %{name}
+      show_resource: Tampilkan %{name}
+      new_resource: "%{name} baru"
+      back: Kembali
+    controller:
+      create:
+        success: "%{resource} telah berhasil dibuat."
+      destroy:
+        success: "%{resource} telah berhasil dihapus."
+      update:
+        success: "%{resource} telah berhasil diperbarui."
+    fields:
+      has_many:
+        more: Menampilkan %{count} dari %{total_count}
+        none: Kosong
+    form:
+      error: error
+      errors: "%{pluralized_errors} membuat %{resource_name} tidak bisa tersimpan:"
+    search:
+      clear: Kosongkan pencarian
+      label: Cari %{resource}

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

@@ -21,8 +21,8 @@ zh-TW:
         more: 顯示 %{total_count} 筆中的 %{count} 筆資料
         none: 無
     form:
-      error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      error: 錯誤
+      errors: "%{pluralized_errors} 導致此 %{resource_name} 不能被儲存："
     search:
-      clear: 清除搜索
-      label: 搜索 %{resource}
+      clear: 清除搜尋
+      label: 搜尋 %{resource}

data/docs/customizing_dashboards.md

@@ -96,7 +96,7 @@ if `searchable` is `true`
 For example:
 
 ```ruby
-  country: Field::BelongsTo(
+  country: Field::BelongsTo.with_options(
     searchable: true,
     seachable_field: 'name',
   )
@@ -135,9 +135,9 @@ Default is `false`.
 For example:
 
 ```ruby
-  cities: Field::HasMany(
+  cities: Field::HasMany.with_options(
     searchable: true,
-    seachable_field: 'name',
+    searchable_field: 'name',
   )
 ```
 
@@ -192,7 +192,7 @@ in.
 
 **Field::Select**
 
-`:collection` - Specify the array or range to select from.  Defaults to `[]`.
+`:collection` - Specify the array or range to select from. Defaults to `[]`.
 
 `:searchable` - Specify if the attribute should be considered when searching.
 Default is `true`.
@@ -246,11 +246,11 @@ Add this method to the dashboard for Users.
 Use whatever attribute or method you like.
 Example for *user*:
 
-````ruby
+```ruby
 def display_resource(user)
   user.name
 end
-````
+```
 
 [define your own]: /adding_custom_field_types
 
@@ -262,7 +262,7 @@ en:
     models:
       customer:
         one: Happy Customer
-        others: Happy Customers
+        other: Happy Customers
 ```
 
 ## Customizing Actions

data/lib/administrate/base_dashboard.rb

@@ -32,6 +32,10 @@ module Administrate
       end
     end
 
+    def all_attributes
+      attribute_types.keys
+    end
+
     def form_attributes
       self.class::FORM_ATTRIBUTES
     end
@@ -61,7 +65,7 @@ module Administrate
         field = self.class::ATTRIBUTE_TYPES[key]
 
         next key if association_classes.include?(field)
-        key if association_classes.include?(field.try :deferred_class)
+        key if association_classes.include?(field.try(:deferred_class))
       end.compact
     end
 

data/lib/administrate/field/has_many.rb

@@ -11,8 +11,8 @@ module Administrate
         { "#{attr.to_s.singularize}_ids".to_sym => [] }
       end
 
-      def associated_collection
-        Administrate::Page::Collection.new(associated_dashboard)
+      def associated_collection(order = self.order)
+        Administrate::Page::Collection.new(associated_dashboard, order: order)
       end
 
       def attribute_key
@@ -39,7 +39,7 @@ module Administrate
         self.class.permitted_attribute(attribute)
       end
 
-      def resources(page = 1)
+      def resources(page = 1, order = self.order)
         resources = order.apply(data).page(page).per(limit)
         includes.any? ? resources.includes(*includes) : resources
       end
@@ -49,7 +49,18 @@ module Administrate
       end
 
       def data
-        @data ||= associated_class.none 
+        @data ||= associated_class.none
+      end
+
+      def order_from_params(params)
+        Administrate::Order.new(
+          params.fetch(:order, sort_by),
+          params.fetch(:direction, direction),
+        )
+      end
+
+      def order
+        @order ||= Administrate::Order.new(sort_by, direction)
       end
 
       private
@@ -71,10 +82,6 @@ module Administrate
         associated_dashboard.display_resource(resource)
       end
 
-      def order
-        @_order ||= Administrate::Order.new(sort_by, direction)
-      end
-
       def sort_by
         options[:sort_by]
       end

data/lib/administrate/page/base.rb

@@ -15,6 +15,10 @@ module Administrate
         @resource_path ||= resource_name.gsub("/", "_")
       end
 
+      def association_includes
+        dashboard.try(:association_includes) || []
+      end
+
       protected
 
       def attribute_field(dashboard, resource, attribute_name, page)

data/lib/administrate/page/collection.rb

@@ -21,7 +21,11 @@ module Administrate
         ordered_by?(attr) && order.direction
       end
 
-      delegate :ordered_by?, :order_params_for, to: :order
+      delegate :ordered_by?, to: :order
+
+      def order_params_for(attr, key: resource_name)
+        { key => order.order_params_for(attr) }
+      end
 
       private
 

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.10.0".freeze
+  VERSION = "0.11.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Nick Charlton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -282,6 +282,7 @@ files:
 - config/locales/administrate.en.yml
 - config/locales/administrate.es.yml
 - config/locales/administrate.fr.yml
+- config/locales/administrate.id.yml
 - config/locales/administrate.it.yml
 - config/locales/administrate.ja.yml
 - config/locales/administrate.ko.yml
@@ -384,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Rails engine for creating super-flexible admin dashboards