Merge branch 'release/0.5.5_patch.5'

* release/0.5.5_patch.5:
  #FIX fix trash
  #FIX bad fix

app/controllers/concerns/trash.rb

@@ -0,0 +1,20 @@
+module Concerns
+  module Trash
+    def to_trash_param(type)
+      type.to_s.split('::').map(&:underscore).join '-'
+    end
+
+    def parse_trash_param(param)
+      type = nil
+      if param.to_sym.in? trash_models
+        type = param
+      else
+        modules = param.split('-')
+        if modules.count > 1 && modules.all? { |mod| mod.to_sym.in?(trash_modules) || mod.to_sym.in?(trash_models) }
+          type = modules.join '/'
+        end
+      end
+      type.camelize.constantize
+    end
+  end
+end

app/controllers/web/admin/trash_controller.rb

@@ -1,4 +1,6 @@
 class Web::Admin::TrashController < Web::Admin::ApplicationController
+  include Concerns::Trash
+
   def index
     @type = resource_type
     @items = resource_type.removed.page(params[:page]).decorate
@@ -7,27 +9,18 @@ def index
   def restore
     item = resource_type.find params[:id]
     item.restore
-    redirect_to type_admin_trash_index_path(resource_type)
+    redirect_to type_admin_trash_index_path to_trash_param resource_type
   end
 
   def destroy
     item = resource_type.find params[:id]
     item.destroy
-    redirect_to type_admin_trash_index_path(resource_type)
+    redirect_to type_admin_trash_index_path to_trash_param resource_type
   end
 
   private
 
   def resource_type
-    resource = nil
-    if params[:type].to_sym.in? trash_models
-      resource = params[:type]
-    else
-      modules = params[:type].split('-')
-      if modules.count > 1 && modules.all? { |mod| mod.to_sym.in?(trash_modules) || mod.to_sym.in?(trash_models) }
-        resource = modules.join '/'
-      end
-    end
-    resource.camelize.constantize
+    parse_trash_param params[:type]
   end
 end

app/decorators/activity_lines/corporative/confession_decorator.rb

@@ -4,7 +4,7 @@ class ActivityLines::Corporative::ConfessionDecorator < ApplicationDecorator
   decorates_association :member
 
   def short_name
-    object.member&.decorate.short_name
+    object.member.decorate.short_name
   end
 
   alias name short_name

app/helpers/web/admin/application_helper.rb

@@ -44,7 +44,5 @@ def to_path(constant)
     constant.name.underscore.gsub '/', '_'
   end
 
-  def to_trash_param(class_name)
-    class_name.to_s.split('::').map(&:underscore).join '-'
-  end
+  include Concerns::Trash
 end

app/models/member.rb

@@ -11,7 +11,8 @@ class Member < User
   has_many :events, as: :organizer,
                     foreign_key: :organizer_id
   has_many :news, foreign_key: :user_id
-  has_many :confessions, class_name: 'ActivityLines::Corporative::Confession'
+  has_many :confessions, class_name: 'ActivityLines::Corporative::Confession',
+                         dependent: :destroy
 
   validates :first_name, human_name: true,
                          allow_blank: true

app/views/web/admin/trash/index.html.haml

@@ -15,8 +15,8 @@
           %td= item.id
           %td= item.name
           %td.actions
-            = link_to restore_admin_trash_path(item, type: @type), method: :patch, class: 'btn btn-primary btn-xs' do
+            = link_to restore_admin_trash_path(item, type: to_trash_param(@type)), method: :patch, class: 'btn btn-primary btn-xs' do
               %span.glyphicon.glyphicon-open
-            = link_to admin_trash_path(item, type: @type), method: :delete, class: 'btn btn-xs btn-danger' do
+            = link_to admin_trash_path(item, type: to_trash_param(@type)), method: :delete, class: 'btn btn-xs btn-danger' do
               %span.glyphicon.glyphicon-remove
 = paginate @items, theme: 'twitter-bootstrap-3'