effective_email_templates 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22f145ef5bb62900fbd74958509c12281582c84f
-  data.tar.gz: 6ee09134ecff68909d39c29ff6f6fb4dbdbd3124
+  metadata.gz: 703e12d4f4476c8924a1a145564ff9523f41dc2a
+  data.tar.gz: 4799a4847e8a6c35493e9c942b1895fce7a76ea9
 SHA512:
-  metadata.gz: ac82b99c9b4c8b756ea97fd244683c3e42f3b0e42a47b8a2fcbd48ebd0d44b94d17dd8723dbb8a6e73be355308bb5d2f066265891e814498e69cbb5b3b9cc3ed
-  data.tar.gz: a6a8f151c292a9be331efb8393553a1edd99058e68c410d3bcb039bdd1938e8e52034c23e658c76723a2dcf2d1503197b2b86f932422ecd57f29168c53956832
+  metadata.gz: 1f20d75db1c3bafb6e2860ad8810011d1536cb93a8f5ab38941cbd82b8905b3feb282f7db8fa3b7ca28e96758b739b25b4aefd958ab79c2daedf366a476ec465
+  data.tar.gz: aabd380d63e9a267ec4ad6263d93824050c47e4b8f93993ec4b711cf69c40c26915605196fbd0a27f2a14362a3e670e99ee9b4831559e2ae27cd75561b9450a4

data/app/controllers/admin/email_templates_controller.rb

@@ -1,11 +1,16 @@
 module Admin
   class EmailTemplatesController < ApplicationController
-    before_filter :authenticate_user!   # This is devise, ensure we're logged in.
+    before_action :authenticate_user!   # This is devise, ensure we're logged in.
 
     layout (EffectiveEmailTemplates.layout.kind_of?(Hash) ? EffectiveEmailTemplates.layout[:admin_email_templates] : EffectiveEmailTemplates.layout)
 
     def index
-      @datatable = Effective::Datatables::EmailTemplates.new()
+      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+        @datatable = Effective::Datatables::EmailTemplates.new()
+      else
+        @datatable = EffectiveEmailTemplatesDatatable.new(self)
+      end
+
       @page_title = 'Email Templates'
 
       authorize_effective_email_templates!

data/app/datatables/effective_email_templates_datatable.rb

@@ -0,0 +1,22 @@
+unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+  class EffectiveEmailTemplatesDatatable < Effective::Datatable
+    datatable do
+      order :subject, :asc
+
+      col :id, visible: false
+      col :slug
+      col :subject
+      col :from
+      col :cc, visible: false, label: 'CC'
+      col :bcc, visible: false, label: 'BCC'
+      col :body, visible: false
+
+      actions_col :actions, partial: '/admin/email_templates/actions', partial_as: 'email_template'
+    end
+
+    collection do
+      Effective::EmailTemplate.all
+    end
+  end
+end
+

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

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

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -177,6 +177,7 @@ files:
 - app/assets/javascripts/effective_email_templates.js
 - app/assets/stylesheets/effective_email_templates.css.scss
 - app/controllers/admin/email_templates_controller.rb
+- app/datatables/effective_email_templates_datatable.rb
 - app/helpers/effective_email_templates_helper.rb
 - app/mailers/effective/email_template_mailer.rb
 - app/models/effective/access_denied.rb