ecm_cms2_backend 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf17ea9c87baaf65ec744a9c2ccda08f929b4735
-  data.tar.gz: 8f0f431ee982860154d02600201125a60b073fa1
+  metadata.gz: 6fa231509982aa2763076a73f32626c5b537afc1
+  data.tar.gz: 7a2d059bb279b0becb83b66ee5c378c5b8fac57a
 SHA512:
-  metadata.gz: 96c05faf3f093857182adcf5865a81e52502dd9d348263a8ba0f210ca3812b4ddd39b6d964fb4131d5c35d18647b7e62a92a91afa417b94f003acaf1109ba1e7
-  data.tar.gz: 118b3ad203c6bb3e6447f4d72c97be1d84a22ff2ce01f2fb657d5b01c6cef3a05f33427258243561641eac9839b06dc70b8c47ca311a75c26e3b2d7baf9f6851
+  metadata.gz: 4c70ba39c757c4efcd645830c808e70cf0d06fe79e1096fea8af1f81429178a8d61ac2d97bef94d17c5f07fd54461fbc9c78e751daaf3b9c3ddeaf0f8397187e
+  data.tar.gz: 027dde3d8148ee8a7f3e8eeee8d2988232dc12359ba7300108dd4aff1fc452c5c57b5cbdf808d0bd30bd776dd658257704ac8107b69b77b7b8950e784e633af1

data/app/controllers/ecm/cms/backend/navigation_items_controller.rb

@@ -1,5 +1,6 @@
 class Ecm::Cms::Backend::NavigationItemsController < Itsf::Backend::Resource::BaseController
-  include Controller::AwesomeNestedSetConcern
+  include ResourcesController::AwesomeNestedSetConcern
+  include ResourcesController::Sorting
   
   def self.resource_class
     Ecm::Cms::NavigationItem
@@ -7,6 +8,10 @@ class Ecm::Cms::Backend::NavigationItemsController < Itsf::Backend::Resource::Ba
 
   private
 
+  def load_collection_scope
+    super.joins(:ecm_cms_navigation)
+  end
+
   def permitted_params
     params.require(:navigation_item)
           .permit(:ecm_cms_navigation_id, :ecm_cms_page_id, :highlights_on, :key, :name, :parent_id, :options, :url, *Ecm::Cms::Configuration.navigation_item_properties)

data/app/views/ecm/cms/backend/navigation_items/_table.html.haml

@@ -1,8 +1,9 @@
-= table.association(:ecm_cms_navigation, sortable: :ecm_cms_navigation_name, url: ->(navigation_item) { navigation_path(navigation_item.ecm_cms_navigation) })
-= table.column(:name, sortable: true) do |navigation_item|
-  %span{ class: "indent indent-chars-#{navigation_item.depth * 3}"}= navigation_item.name
-= table.column :url, sortable: true
-= table.column(:ecm_cms_page, sortable: :ecm_cms_page_title) do |navigation_item|
+= table.awesome_nested_set_actions scope: ->(navigation_item) { navigation_item.root.ecm_cms_navigation.to_param }
+= table.association(:ecm_cms_navigation, sort: { column_name: 'ecm_cms_navigations.name'}, link_to: ->(navigation_item) { navigation_path(navigation_item.ecm_cms_navigation) })
+= table.column(:name, sort: true) do |navigation_item|
+  - capture_haml do
+    %span{ class: "indent indent-chars-#{navigation_item.depth * 3}"}= navigation_item.name
+= table.column :url, sort: true
+= table.column(:ecm_cms_page, sort: { column_name: :ecm_cms_page_title }) do |navigation_item|
   - link_to navigation_item.ecm_cms_page.title, page_path(navigation_item.ecm_cms_page) if navigation_item.ecm_cms_page.present?
-= table.timestamps
-= table.awesome_nested_set_actions scope: ->(navigation_item) { navigation_item.root.ecm_cms_navigation.to_param }
+= table.timestamps(format: :short)

data/lib/ecm/cms/backend/version.rb

@@ -1,7 +1,7 @@
 module Ecm
   module Cms
     module Backend
-      VERSION = '1.2.3'.freeze
+      VERSION = '1.3.0'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_cms2_backend
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2018-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails