effective_pages 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 587508cec2b677dd7fe58c72c21959f0d197c1c9
-  data.tar.gz: f74c3e83c9185298f302b32ca4425e2a8d3c0dc8
+  metadata.gz: bb5bc39d6d56fdb47258f05427525b1bf76591d4
+  data.tar.gz: a830fb0aa95733fc882a9cdec9f8f8d33b388e2b
 SHA512:
-  metadata.gz: 89d3bd9324ee7858b41016218c9150de0ef47d24e9a993e6e646173d2b50f8c436a0cac489aeca640b31e4626c8814ff3adc14cba7104dd59a5faa9f19457e4c
-  data.tar.gz: 9c13ffda03b844cab226b6b8f40829e491d35065534b5691f2f71f7d516fd980e6832a242f9d53101531228d03e95ce45e134bede7592d1a29fe712e2b75fa7f
+  metadata.gz: 3d624c0a5d06b1775010b90511e8a92ec1e1ed2d503bc10594378c0cf7c17f49419da44fe50b43ea203b3a75d010ef3afbf2f8eb7f3489f36a0d7f8ee63b382b
+  data.tar.gz: 9aae7a67e312587e7e1a020c54d9f035aae9fbf988e9def8046e9e21a74607b7eda1523e754d2393ec5cbbbf0c7a51eec53b5d19931519d151aa260ad481e542

data/app/controllers/admin/menus_controller.rb

@@ -7,7 +7,12 @@ module Admin
     layout (EffectivePages.layout.kind_of?(Hash) ? EffectivePages.layout[:admin] : EffectivePages.layout)
 
     def index
-      @datatable = Effective::Datatables::Menus.new() if defined?(EffectiveDatatables)
+      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+        @datatable = Effective::Datatables::Menus.new()
+      else
+        @datatable = EffectiveMenusDatatable.new(self)
+      end
+
       @page_title = 'Menus'
 
       authorize_effective_menus!

data/app/controllers/admin/pages_controller.rb

@@ -5,7 +5,12 @@ module Admin
     layout (EffectivePages.layout.kind_of?(Hash) ? EffectivePages.layout[:admin] : EffectivePages.layout)
 
     def index
-      @datatable = Effective::Datatables::Pages.new() if defined?(EffectiveDatatables)
+      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+        @datatable = Effective::Datatables::Pages.new()
+      else
+        @datatable = EffectivePagesDatatable.new(self)
+      end
+
       @page_title = 'Pages'
 
       authorize_effective_pages!

data/app/datatables/effective_menus_datatable.rb

@@ -0,0 +1,18 @@
+unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+  class EffectiveMenusDatatable < Effective::Datatable
+
+    datatable do
+      col :id, visible: false
+      col :updated_at, visible: false
+
+      col :title
+
+      actions_col partial: 'admin/menus/actions', partial_as: :menu
+    end
+
+    collection do
+      Effective::Menu.all
+    end
+
+  end
+end

data/app/datatables/effective_pages_datatable.rb

@@ -0,0 +1,23 @@
+unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+  class EffectivePagesDatatable < Effective::Datatable
+
+    datatable do
+      order :title, :asc
+      length :all
+
+      col :id, visible: false
+      col :updated_at, visible: false
+
+      col :title
+      col :slug
+      col :draft
+
+      actions_col partial: 'admin/pages/actions', partial_as: :page
+    end
+
+    collection do
+      Effective::Page.all
+    end
+
+  end
+end

data/app/helpers/effective_pages_helper.rb

@@ -18,7 +18,7 @@ module EffectivePagesHelper
       tag(:meta, property: 'og:title',       content: effective_pages_page_title),
       tag(:meta, property: 'og:description', content: effective_pages_meta_description),
       tag(:meta, property: 'og:url',         content: request.original_url),
-      tag(:meta, property: 'og:image',       content: asset_path(EffectivePages.site_og_image.to_s))
+      tag(:meta, property: 'og:image',       content: asset_url(EffectivePages.site_og_image.to_s))
     ].compact.join("\n").html_safe
   end
 

data/app/models/effective/datatables/menus.rb

@@ -1,4 +1,4 @@
-if defined?(EffectiveDatatables)
+if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
   module Effective
     module Datatables
       class Menus < Effective::Datatable

data/app/models/effective/datatables/pages.rb

@@ -1,4 +1,4 @@
-if defined?(EffectiveDatatables)
+if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
   module Effective
     module Datatables
       class Pages < Effective::Datatable

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,6 +153,8 @@ files:
 - app/controllers/admin/menus_controller.rb
 - app/controllers/admin/pages_controller.rb
 - app/controllers/effective/pages_controller.rb
+- app/datatables/effective_menus_datatable.rb
+- app/datatables/effective_pages_datatable.rb
 - app/helpers/effective_breadcrumbs_helper.rb
 - app/helpers/effective_menus_admin_helper.rb
 - app/helpers/effective_menus_helper.rb