udongo 7.0.4 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c135da722b47005ae85f69f4332dfd5edea9786
-  data.tar.gz: 612200fa1b054962a8fcdacfcedc3a0d19a7c4d5
+  metadata.gz: eddb02b167743ffd6166fd062885708cbed71b8e
+  data.tar.gz: ae1daa1b79d85919ba66c7c049c29e5ca028390b
 SHA512:
-  metadata.gz: 284c83ab7857f6029f2c417152ba4ee910d1482f91e5f9e22c62c71dd046c47957490718460be94ef853d40876f6865d6de192ca1fcc5cb0aff240bf5a020514
-  data.tar.gz: eb2aad280cf8381279b4235c349cf707833a96ca6203246ed12437b1493cc7a6a36ffe9267a5e2b99245e37133b9305e090da2eee7541b2f114f2baef7aafab6
+  metadata.gz: 006cfec31bf00e912a00b8ad55ed524171eb3d5074f26d1996c37a40999b9ae719cf33949aab5b1fb813e83a192d6eb12ea94113c98dd8d8f90f9173a7fb2372
+  data.tar.gz: c7543cb1308bef013dd4eb24db9cc3e7e63b587c01d5a0948b5a7686c2bcf0eadfe296f6a2a0e2fb99aa7bab99ad9bfccbf5ef6cd93acd27cc4e929e430d3045

data/app/controllers/backend/emails_controller.rb

@@ -4,7 +4,8 @@ class Backend::EmailsController < Backend::BaseController
   before_action -> { breadcrumb.add t('b.emails'), backend_emails_path }
 
   def index
-    @emails = paginate Email.order('id DESC')
+    @search = Email.search(params[:q])
+    @emails = paginate @search.result(distinct: true).order('sent_at DESC')
   end
 
   def show

data/app/forms/backend/translation_with_seo_form.rb

@@ -8,7 +8,7 @@ class Backend::TranslationWithSeoForm < Udongo::Form
   attribute :seo_custom, String
   attribute :seo_slug, String
 
-  validates :seo_slug, presence: true
+  validates :seo_slug, :seo_title, :seo_description, presence: true
 
   def initialize(model, translation, seo)
     @model = model

data/app/views/backend/emails/_filter.html.erb

@@ -0,0 +1,40 @@
+<div class="card filter">
+  <div class="card-block">
+    <%= search_form_for [:backend, @search] do |f| %>
+      <div class="row">
+        <div class="form-group col-md-6 col-lg-3">
+          <%= f.search_field :to_name_cont, class: 'form-control', placeholder: 'Naam' %>
+        </div>
+
+        <div class="form-group col-md-6 col-lg-3">
+          <%= f.search_field :to_email_cont, class: 'form-control', placeholder: 'E-mailadres' %>
+        </div>
+
+        <div class="form-group col-md-6 col-lg-3">
+          <%= f.search_field :cc_cont, class: 'form-control', placeholder: 'CC' %>
+        </div>
+
+        <div class="form-group col-md-6 col-lg-3">
+          <%= f.search_field :bcc_cont, class: 'form-control mb-2', placeholder: 'BCC' %>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="form-group col-md-5 col-lg-4">
+          <%= f.search_field :subject_cont, class: 'form-control', placeholder: 'Onderwerp' %>
+        </div>
+
+        <div class="form-group col-md-7 col-lg-8">
+          <%= f.search_field :html_content_cont, class: 'form-control', placeholder: 'Berichtinhoud' %>
+        </div>
+      </div>
+
+      <div class="form-inline">
+        <div class="form-group">
+          <%= f.submit class: 'btn btn-primary mr-2' %>
+          <%= link_to t('b.cancel'), backend_emails_path, class: 'btn btn-secondary btn-sm' %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/backend/emails/index.html.erb

@@ -1,4 +1,5 @@
 <%= render 'backend/breadcrumbs' %>
+<%= render 'filter' %>
 
 <% if @emails.any? %>
   <table class="table table-striped table-hover">

data/changelog.md

@@ -1,3 +1,9 @@
+7.1.0 - 2017-10-19
+--
+* Make the SEO title and description mandatory for Backend::TranslationWithSeoForm
+* Add e-mail filters for the most common fields.
+
+
 7.0.4 - 2017-10-05
 --
 * Bugfix: make sure the tag autocomplete is locale specific.

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '7.0.4'
+  VERSION = '7.1.0'
 end

data/spec/factories/translation_with_seo_forms.rb

@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory 'backend/translation_with_seo_form' do
+    seo_slug 'foo'
+    seo_title 'Foo'
+    seo_description 'This is a foo'
+
+    model { create(:page) }
+    translation { model.translation(:nl) }
+    seo { model.seo(:nl) }
+    initialize_with { new(model, translation, seo) }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 7.0.4
+  version: 7.1.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -661,6 +661,7 @@ files:
 - app/views/backend/email_templates/edit_translation.html.erb
 - app/views/backend/email_templates/index.html.erb
 - app/views/backend/email_templates/new.html.erb
+- app/views/backend/emails/_filter.html.erb
 - app/views/backend/emails/index.html.erb
 - app/views/backend/emails/show.html.erb
 - app/views/backend/forms/_fields.html.erb
@@ -941,6 +942,7 @@ files:
 - spec/factories/stores.rb
 - spec/factories/tagged_items.rb
 - spec/factories/tags.rb
+- spec/factories/translation_with_seo_forms.rb
 - spec/factories/users.rb
 - spec/support/concerns/cacheable.rb
 - spec/support/concerns/commentable.rb