udongo 5.0.2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ebf3adfc859ce7df9af8b0770945c03f7cdc337
-  data.tar.gz: 0576147999f321b1f1cd668284b9605cac051140
+  metadata.gz: 6e7758e4a1bfb4e24e8b4ff54ba00225802be713
+  data.tar.gz: 2c45f1de07eac96c9127c5bfb0c338bec8754f51
 SHA512:
-  metadata.gz: 702c4a17ba9be8b39410d1aabc96ccad973f6d538dd2d22297b47cfd700f1041c823aed750b548ce7f788ae08898fa8976b5a829d5459c2010ab48e727ed9d67
-  data.tar.gz: 8abd987fea228857b348267e8d88927e10835000b6d6da3cf3f441b5e59b0f1a39a175bebdebffb25095096974613b71fc7debd3ba37878bffcba3328d280bd7
+  metadata.gz: 3f2a7cbd3e48e5a773ed2bfe24ccbcc0eeb10ae6570b32bea19381875e30ebb710bbd4761cd6063aeee7ff41912dc52923a057ea6986f33ae48dff0771985d59
+  data.tar.gz: 7291bf66476a79eba40459c33e5234ed20679f9c37177d0f1e6ed22ad061edce684c3730b7f2a396f7008037b676a0af08d616394023edf69fd0729d65487781

data/app/assets/stylesheets/backend/components/_form.scss

@@ -11,6 +11,11 @@
   margin-bottom: 2rem;
 }
 
+// To make sure collections rendered by SimpleForm show on multiple lines.
+label.collection_check_boxes {
+  display: block;
+}
+
 // Underscored because of SimpleForm
 .date_picker, .date_range_picker {
   [readonly="readonly"] {

data/app/assets/stylesheets/backend/components/_table.scss

@@ -0,0 +1,3 @@
+td.handle {
+  width: 50px;
+}

data/app/assets/stylesheets/backend/udongo.scss

@@ -11,6 +11,7 @@
 @import 'components/form';
 @import 'components/nav';
 @import 'components/page_tree';
+@import 'components/table';
 
 // Page specific styles
 @import 'pages/login';

data/app/controllers/backend/emails_controller.rb

@@ -4,7 +4,7 @@ class Backend::EmailsController < Backend::BaseController
   before_action -> { breadcrumb.add t('b.emails'), backend_emails_path }
 
   def index
-    @emails = paginate Email.all.order('id DESC')
+    @emails = paginate Email.order('id DESC')
   end
 
   def show

data/app/controllers/backend/users_controller.rb

@@ -1,9 +1,12 @@
 class Backend::UsersController < Backend::BaseController
-  before_action :find_user, only: [:show, :edit, :update, :destroy]
+  include Concerns::PaginationController
+
+  before_action :find_model, only: [:show, :edit, :update, :destroy]
   before_action -> { breadcrumb.add t('b.users'), backend_users_path }
 
   def index
-    @users = User.all
+    @search = User.ransack params[:q]
+    @users = @search.result(distinct: true).order(:last_name, :first_name).page(page_number).per_page(per_page)
   end
 
   def show
@@ -39,13 +42,13 @@ class Backend::UsersController < Backend::BaseController
 
   private
 
-  def find_user
+  def find_model
     @user = User.find params[:id]
   end
 
   def allowed_params
     params[:user].permit(
-      :first_name, :last_name, :email, :password, :password_confirmation
+      :first_name, :last_name, :email, :active, :password, :password_confirmation
     )
   end
 end

data/app/controllers/concerns/pagination_controller.rb

@@ -32,7 +32,7 @@ module Concerns
         return i if params[:per_page].to_i == i
       end
 
-      30
+      10
     end
   end
 end

data/app/forms/backend/page_translation_form.rb

@@ -1,68 +1,10 @@
-class Backend::PageTranslationForm < Udongo::Form
-  attr_reader :page, :translation, :seo
-
+class Backend::PageTranslationForm < Backend::TranslationWithSeoForm
   attribute :title, String
   attribute :subtitle, String
 
-  attribute :seo_title, String
-  attribute :seo_keywords, String
-  attribute :seo_description, String
-  attribute :seo_custom, String
-  attribute :seo_slug, String
-
-  validates :title, :seo_slug, presence: true
-
-  delegate :id, to: :page
-
-  def initialize(page, translation, seo)
-    @page = page
-    @translation = translation
-    @seo = seo
-
-    self.title = @translation.title
-    self.subtitle = @translation.subtitle
-
-    %w(title keywords description custom slug).each do |f|
-      self.send("seo_#{f}=", @seo.send(f))
-    end
-  end
+  validates :title, presence: true
 
   def self.model_name
     Page.model_name
   end
-
-  def persisted?
-    true
-  end
-
-  def save(params)
-    self.title = params[:title]
-    self.subtitle = params[:subtitle]
-
-    %w(title keywords description custom slug).each do |f|
-      self.send("seo_#{f}=", params["seo_#{f}".to_sym])
-    end
-
-    if valid?
-      save_object
-      true
-    else
-      false
-    end
-  end
-
-  private
-
-  def save_object
-    @translation.title = title
-    @translation.subtitle = subtitle
-
-    %w(title keywords description custom slug).each do |f|
-      @seo.send("#{f}=", send("seo_#{f}"))
-    end
-
-    # Saves the page, translation and SEO info all at once.
-    @seo.save!
-    @page.save!
-  end
 end

data/app/forms/backend/translation_with_seo_form.rb

@@ -0,0 +1,71 @@
+class Backend::TranslationWithSeoForm < Udongo::Form
+  attr_reader :model, :translation, :seo
+  delegate :id, to: :model
+
+  attribute :seo_title, String
+  attribute :seo_keywords, String
+  attribute :seo_description, String
+  attribute :seo_custom, String
+  attribute :seo_slug, String
+
+  validates :seo_slug, presence: true
+
+  def initialize(model, translation, seo)
+    @model = model
+    @translation = translation
+    @seo = seo
+
+    non_seo_attributes.each do |f|
+      self.send "#{f}=", @translation.send(f)
+    end
+
+    seo_attributes.each do |f|
+      self.send("seo_#{f}=", @seo.send(f))
+    end
+  end
+
+  def persisted?
+    true
+  end
+
+  def save(params)
+    non_seo_attributes.each do |f|
+      self.send "#{f}=", params[f.to_sym]
+    end
+
+    seo_attributes.each do |f|
+      self.send("seo_#{f}=", params["seo_#{f}".to_sym])
+    end
+
+    if valid?
+      save_object
+      true
+    else
+      false
+    end
+  end
+
+  def seo_attributes
+    %w(title keywords description custom slug)
+  end
+
+  def non_seo_attributes
+    attributes.keys.select { |k| !k.to_s.starts_with?('seo_') }
+  end
+
+  private
+
+  def save_object
+    non_seo_attributes.each do |f|
+      @translation.send "#{f}=", self.send(f)
+    end
+
+    seo_attributes.each do |f|
+      @seo.send("#{f}=", send("seo_#{f}"))
+    end
+
+    # Saves the model, translation and SEO info all at once.
+    @seo.save!
+    @model.save!
+  end
+end

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

@@ -0,0 +1,25 @@
+<div class="card filter">
+  <div class="card-block">
+    <%= search_form_for [:backend, @search] do |f| %>
+      <div class="row">
+        <div class="col-md-4 form-group">
+          <%= f.search_field :first_name_cont, placeholder: t('b.first_name'), class: 'form-control' %>
+        </div>
+
+        <div class="col-md-4 form-group">
+          <%= f.search_field :last_name_cont, placeholder: t('b.last_name'), class: 'form-control' %>
+        </div>
+
+        <div class="col-md-4 form-group">
+          <%= f.search_field :email_cont, placeholder: t('b.email'), class: 'form-control' %>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-md-6">
+          <%= f.submit class: 'btn btn-primary btn-sm' %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/backend/users/_form.html.erb

@@ -25,6 +25,7 @@
         <div class="card-block">
           <%= f.input :password, required: @user.new_record? %>
           <%= f.input :password_confirmation, required: @user.new_record? %>
+          <%= f.input :active %>
         </div>
       </div>
     </div>

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

@@ -1,4 +1,5 @@
 <%= render 'backend/breadcrumbs' %>
+<%= render 'filter' %>
 
 <p class="text-xs-right">
   <%= link_to icon(:plus, t('b.add')), new_backend_user_path, class: 'btn btn-primary btn-sm' %>
@@ -10,24 +11,28 @@
       <tr>
         <th><%= t 'b.name' %></th>
         <th><%= t 'b.email' %></th>
+        <th><%= t 'b.active' %></th>
         <th>&nbsp;</th>
       </tr>
     </thead>
 
     <tbody>
-      <% @users.each do |a| %>
-        <tr>
-          <td><%= a.full_name %></td>
-          <td><%= mail_to a.email %></td>
+      <% @users.each do |u| %>
+        <tr class="<%= 'text-muted' unless u.active? %>">
+          <td><%= u.full_name %></td>
+          <td><%= mail_to u.email %></td>
+          <td><%= t u.active?.to_s %></td>
           <td class="text-xs-right">
-            <%= link_to icon(:pencil_square_o), edit_backend_user_path(a) %>
-            <%= link_to icon(:trash), backend_user_path(a), method: :delete, data: { confirm: t('b.msg.confirm') }%>
+            <%= link_to icon(:pencil_square_o), edit_backend_user_path(u) %>
+            <%= link_to icon(:trash), backend_user_path(u), method: :delete, data: {confirm: t('b.msg.confirm') }%>
           </td>
         </tr>
       <% end %>
     </tbody>
   </table>
 
+  <%= udongo_paginate @users %>
+
 <% else %>
   <p><%= t 'b.msg.no_items' %></p>
 <% end %>

data/changelog.md

@@ -1,4 +1,17 @@
-5.0.2 - xxxx-xx-xx
+5.1.0 - 2017-02-15
+--
+* The users module now orders by last/first name.
+* The default number of items per page is now 10 instead of 30.
+* A user now has an active/inactive state that you can manage.
+* You can now filter users by their first name, last name and email address.
+* Next to the ```Backend::TranslationForm``` we now added the ```Backend::TranslationWithSeoForm```
+  which makes those forms great again.
+* Add fix for a collection of checkboxes rendered by SimpleForm to show on
+  multiple lines.
+* Set a max width for the cell containing the sortable handle.
+
+
+5.0.2 - 2017-02-13
 --
 * Fix bug in the SEO form of b/pages#edit_translation that prevented you from
   saving SEO data.

data/config/locales/nl_backend.yml

@@ -1,6 +1,7 @@
 nl:
   b:
     actions: Acties
+    active: Actief
     add: Toevoegen
     admin: Beheerder
     admins: Beheerders

data/config/locales/nl_forms.yml

@@ -13,6 +13,7 @@ nl:
 
     labels:
       defaults:
+        active: Actief
         bcc: BCC
         caption: Beschrijving
         category: Categorie

data/db/migrate/20170215132531_add_active_to_users.rb

@@ -0,0 +1,6 @@
+class AddActiveToUsers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :users, :active, :boolean, after: 'email'
+    add_index :users, :active
+  end
+end

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '5.0.2'
+  VERSION = '5.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -442,6 +442,7 @@ files:
 - app/assets/stylesheets/backend/components/_nav.scss
 - app/assets/stylesheets/backend/components/_navbar.scss
 - app/assets/stylesheets/backend/components/_page_tree.scss
+- app/assets/stylesheets/backend/components/_table.scss
 - app/assets/stylesheets/backend/components/_tabs.scss
 - app/assets/stylesheets/backend/custom.scss
 - app/assets/stylesheets/backend/font-awesome.scss
@@ -490,6 +491,7 @@ files:
 - app/forms/backend/page_translation_form.rb
 - app/forms/backend/snippet_translation_form.rb
 - app/forms/backend/translation_form.rb
+- app/forms/backend/translation_with_seo_form.rb
 - app/helpers/backend/dropdown_helper.rb
 - app/helpers/backend/pagination_helper.rb
 - app/helpers/icon_helper.rb
@@ -617,6 +619,7 @@ files:
 - app/views/backend/snippets/edit_translation.html.erb
 - app/views/backend/snippets/index.html.erb
 - app/views/backend/snippets/new.html.erb
+- app/views/backend/users/_filter.html.erb
 - app/views/backend/users/_form.html.erb
 - app/views/backend/users/_tabs.html.erb
 - app/views/backend/users/edit.html.erb
@@ -718,6 +721,7 @@ files:
 - db/migrate/20170118153840_create_search_modules.rb
 - db/migrate/20170202170310_rename_key_to_name_for_search_indices.rb
 - db/migrate/20170212150903_cleanup_user_model.rb
+- db/migrate/20170215132531_add_active_to_users.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb