inline_forms 6.0.5 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7294976b3ac09b7775c3a0a36925ce4ccb4f73f
-  data.tar.gz: 945113c29e712687c341ef479de35d5242096fca
+  metadata.gz: 7699a366575cf2f80d88f82690e4fa35a745ab62
+  data.tar.gz: 2302ad5c8577598ab406f600c4e58da9767557ee
 SHA512:
-  metadata.gz: 68737c524ed39ab962da6e43b95ba051e453795dd7f03add546a1145eb44cbda13a7204c786649313fdcec04de70b96001b06f729e34aec55518d2fccef8fe04
-  data.tar.gz: 2df74e31c2ee0b47e6d0d38c565cf889812e58c60ed851661db018b2140bb8955f2d084157c0c707a9b8086a8529953a691cc5098aa933c04e22f6a4e0d15a64
+  metadata.gz: a57adab713ef09d53421d2bb3252518eaee1945652f5f5c8698b830cb3d218c9754d3c3039588b272800b2f59a1f791af50181969bfcd93e532d75d358f46b9e
+  data.tar.gz: 99c0ca10e136ab2242836488d20ead84b3fc04f327a8c344d6b90b62f10b5ccefdcda8ee5f7a92d45b6fe6f97e2e65cc07853cb149c3f165892ac85b5b29df4c

data/app/assets/javascripts/inline_forms/inline_forms.js

@@ -4,6 +4,7 @@
 //= require jquery.timepicker.js
 //= require foundation
 //= require jquery.remotipart
+//= require autocomplete-rails
 
 $(function(){ $(document).foundation(); });
 // initialize datepickers

data/app/controllers/inline_forms_application_controller.rb

@@ -2,7 +2,7 @@
 class InlineFormsApplicationController < ActionController::Base
   protect_from_forgery
   layout 'devise' if :devise_controller?
-  
+
   # limit available locales by setting this. Override in applicaton_controller.
   I18n.available_locales = [ :en, :nl, :pp ]
 
@@ -10,7 +10,7 @@ class InlineFormsApplicationController < ActionController::Base
   def set_locale
     I18n.locale = extract_locale_from_subdomain || I18n.default_locale
   end
-  
+
   # Get locale code from request subdomain (like http://it.application.local:3000)
   def extract_locale_from_subdomain
     locale = request.subdomains.first

data/app/controllers/inline_forms_controller.rb

@@ -95,7 +95,7 @@ class InlineFormsController < ApplicationController
     @update_span = params[:update]
     attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list
     attributes.each do | attribute, name, form_element |
-      send("#{form_element.to_s}_update", @object, attribute) unless form_element == :tree || form_element == :associated || (cancan_enabled? && cannot?(:read, @Klass.to_s.underscore.pluralize.to_sym, attribute))
+      send("#{form_element.to_s}_update", @object, attribute) unless form_element == :tree || form_element == :associated || (cancan_enabled? && cannot?(:read, @object, attribute))
     end
     @parent_class = params[:parent_class]
     @parent_id = params[:parent_id]
@@ -180,29 +180,41 @@ class InlineFormsController < ApplicationController
     end
   end
 
-  # :destroy destroys the record, but also shows an undo link (with paper_trail)
+  # :soft_delete
+  def soft_delete
+    @update_span = params[:update]
+    @object = referenced_object
+    # destroy the object
+    @object.soft_delete(current_user)
+    respond_to do |format|
+      format.html { } unless @Klass.not_accessible_through_html?
+      format.js { render :close }
+    end
+  end
+
+  # :soft_restore
+  def soft_restore
+    @update_span = params[:update]
+    @object = referenced_object
+    # restore the object
+    @object.soft_restore
+    respond_to do |format|
+      format.html { } unless @Klass.not_accessible_through_html?
+      format.js { render :close }
+    end
+  end
+
+  # :destroy destroys the record. There is no undo!
   def destroy
     @update_span = params[:update]
     @object = referenced_object
     if current_user.role? :superadmin
-      if (@Klass.soft_deletable? rescue false)
-        @object.soft_delete(current_user)
-        respond_to do |format|
-          format.html { } unless @Klass.not_accessible_through_html?
-          format.js { render :close }
-        end
-      elsif
-        @object.destroy
-        respond_to do |format|
-          format.html { } unless @Klass.not_accessible_through_html?
-          format.js { render :show_undo }
-        end
-      end
-    elsif (@Klass.soft_deletable? rescue false)
-      @object.soft_delete(current_user)
+      # destroy the object
+      @undo_object = @object.versions.last
+      @object.destroy
       respond_to do |format|
         format.html { } unless @Klass.not_accessible_through_html?
-        format.js { render :close }
+        format.js { render :record_destroyed }
       end
     end
   end
@@ -211,27 +223,12 @@ class InlineFormsController < ApplicationController
   # Thanks Ryan Bates: http://railscasts.com/episodes/255-undo-with-paper-trail
   def revert
     @update_span = params[:update]
+    @object = referenced_object
     if current_user.role? :superadmin
-      if (@Klass.soft_deletable? rescue false)
-        @object = referenced_object
-        @object.soft_restore
-        respond_to do |format|
-          format.html { } unless @Klass.not_accessible_through_html?
-          format.js { render :close }
-        end
-      elsif
-        @version = PaperTrail::Version.find(params[:id])
-        @version.reify.save!
-        @object = @Klass.find(@version.item_id)
-        authorize!(:revert, @object) if cancan_enabled?
-        respond_to do |format|
-          format.html { } unless @Klass.not_accessible_through_html?
-          format.js { render :close }
-        end
-      end
-    elsif (@Klass.soft_deletable? rescue false)
-      @object = referenced_object
-      @object.soft_restore
+      @version = PaperTrail::Version.find(params[:id])
+      @version.reify.save!
+      @object = @Klass.find(@version.item_id)
+      authorize!(:revert, @object) if cancan_enabled?
       respond_to do |format|
         format.html { } unless @Klass.not_accessible_through_html?
         format.js { render :close }

data/app/helpers/inline_forms_helper.rb

@@ -30,37 +30,44 @@ module InlineFormsHelper
       :title => t('inline_forms.view.close')
   end
 
-  # destroy link
-  def link_to_destroy( object, update_span )
-    if current_user.role? :superadmin
-      if cancan_disabled? || ( can? :delete, object )
-        link_to "<i class='fi-trash'></i>".html_safe,
-          send( object.class.to_s.underscore + '_path',
-          object,
-          :update => update_span ),
-          :method => :delete,
-          :remote => true,
-          :title => t('inline_forms.view.trash')
-      end
-    elsif (object.class.safe_deletable? rescue false)
-      if object.deleted?     && (cancan_disabled? || ( can? :revert, object ))
-        link_to "undelete".html_safe,
-          send( 'revert_' + object.class.to_s.underscore + '_path',
+  # delete link. Mind the difference between delete and destroy.
+  def link_to_soft_delete( object, update_span )
+    soft=''
+    if (object.soft_deletable? rescue false)
+      if object.deleted?     && (cancan_disabled? || ( can? :soft_restore, object ))
+        soft = link_to "<i class='fi-refresh'></i>".html_safe,
+          send( 'soft_restore_' + object.class.to_s.underscore + '_path',
           object,
           :update => update_span ),
           :method => :post,
           :remote => true,
-          :title => t('inline_forms.view.trash')
-      elsif !object.deleted? && (cancan_disabled? || ( can? :delete, object ))
-        link_to "<i class='fi-trash'></i>".html_safe,
-          send( object.class.to_s.underscore + '_path',
-          object,
-          :update => update_span ),
-          :method => :delete,
-          :remote => true,
-          :title => t('inline_forms.view.trash')
+          :title => t('inline_forms.view.undelete')
+      elsif !object.deleted? && (cancan_disabled? || ( can? :soft_delete, object ))
+        soft = link_to "<i class='fi-trash'></i>".html_safe,
+        send( 'soft_delete_' + object.class.to_s.underscore + '_path',
+        object,
+        :update => update_span ),
+        :method => :post,
+        :remote => true,
+        :title => t('inline_forms.view.trash')
       end
     end
+    soft.html_safe
+  end
+
+  # destroy link. Mind the difference between delete and destroy.
+  def link_to_destroy( object, update_span )
+    hard=''
+    if cancan_disabled? || ( can? :destroy, object )
+      hard = link_to "&nbsp;&nbsp;<font color='FF0000'><i class='fi-x'></i></font>".html_safe,
+        send( object.class.to_s.underscore + '_path',
+        object,
+        :update => update_span ),
+        :method => :delete,
+        :remote => true,
+        :title => t('inline_forms.view.trash')
+    end
+    hard.html_safe
   end
 
   # new link
@@ -76,7 +83,7 @@ module InlineFormsHelper
                    :title => t('inline_forms.view.add_new', :model => model.model_name.human )
           )
     if cancan_enabled?
-      if can? :create, model.to_s.pluralize.underscore.to_sym
+      if can? :create, model
         if parent_class.nil?
           raw out
         else
@@ -99,7 +106,7 @@ module InlineFormsHelper
                    :class => html_class,
                    :title => t('inline_forms.view.list_versions')
           )
-    if can? :list_versions, object.class.name.pluralize.underscore.to_sym
+    if can? :list_versions, object
       raw out
     end
   end
@@ -123,7 +130,8 @@ module InlineFormsHelper
     spaces = attribute_value.length > 40 ? 0 : 40 - attribute_value.length
     value = h(attribute_value) + ("&nbsp;" * spaces).html_safe
     css_class_id = "#{object.class.to_s.underscore}_#{object.id}_#{attribute}"
-    if cancan_disabled? || ( can? :update, object, attribute )
+    if (cancan_disabled? rescue true) || ( can? :update, object, attribute )
+      # some problem with concerns makes this function not available when called direct. FIXME
       link_to value,
         send( 'edit_' + object.class.to_s.underscore + '_path',
         object,

data/app/models/concerns/inline_forms/soft_deletable.rb

@@ -14,21 +14,21 @@ module InlineForms::SoftDeletable
 #   end
 # end
 
-  def self.soft_deletable?
+  def soft_deletable?
     true
   end
 
   def soft_delete(current_user)
-    deleted = 2
-    deleter = current_user
-    deleted_at = Time.current
+    self.deleted = 2
+    self.deleter = current_user
+    self.deleted_at = Time.current
     save
   end
 
   def soft_restore
-    deleted = 1
-    deleted_by = nil
-    deleted_at = nil
+    self.deleted = 1
+    self.deleted_by = nil
+    self.deleted_at = nil
     save
   end
 

data/app/views/inline_forms/_close.html.erb

@@ -1,5 +1,6 @@
-<% if cancan_disabled? || ( can? :delete, @object ) %>
+<% if cancan_disabled? || ( can? :soft_delete, @object ) %>
   <div  class="small-1 column">
+    <%= link_to_soft_delete(@object, @update_span) -%>
     <%= link_to_destroy(@object, @update_span) -%>
   </div>
   <div  class="small-11 column">

data/app/views/inline_forms/_header.html.erb

@@ -22,7 +22,7 @@
               <% MODEL_TABS.each do |m| %>
                 <% model = m.singularize.camelcase.constantize rescue nil %>
                   <% unless model.nil? || model.not_accessible_through_html? %>
-                  <% if can? :update, m.to_sym %>
+                  <% if can? :update, model %>
                     <li>
                       <%= link_to model.model_name.human, '/' +  m %>
                     </li>

data/app/views/inline_forms/_list.html.erb

@@ -53,8 +53,9 @@
     <% path_to_object = attribute.to_s.singularize.underscore + "_path" %>
   <% end %>
   <div class="row <%= cycle('odd', 'even') %><%= " top-level" if parent_class.nil? %>" id="<%= css_class_id -%>">
-    <% if cancan_disabled? || ( can? :delete, object ) %>
+    <% if cancan_disabled? || ( can? :soft_delete, object ) %>
       <div  class="small-1 column">
+        <%= link_to_soft_delete(object, css_class_id) -%>
         <%= link_to_destroy(object, css_class_id) -%>
       </div>
       <div  class="small-11 column">

data/app/views/inline_forms/_new.html.erb

@@ -23,7 +23,7 @@
                                                                   :multipart => true, :remote => true, :class  => "edit_form" do -%>
     <% attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list -%>
     <% attributes.each do | attribute, name, form_element | -%>
-      <% unless form_element.to_sym == :associated || form_element.to_sym == :tree || (cancan_enabled? && cannot?(:read, @Klass.to_s.underscore.pluralize.to_sym, attribute)) -%>
+      <% unless form_element.to_sym == :associated || form_element.to_sym == :tree || (cancan_enabled? && cannot?(:read, @object, attribute)) -%>
         <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
         <% if form_element && form_element.to_sym == :header %>
           <div class="row form_element_header" >

data/app/views/inline_forms/_show.html.erb

@@ -115,7 +115,7 @@
         <% end %>
       <% end %>
     <% end %>
-    <% if can? :list_versions, @object.class.name.pluralize.underscore.to_sym  %>
+    <% if can? :list_versions, @object  %>
       <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_versions" -%>
       <div id="<%= css_class_id -%>">
         <%= render 'versions' %>

data/app/views/inline_forms/_versions_list.html.erb

@@ -44,11 +44,14 @@
       <div class="small-1 column">
         <%= version.event -%>
       </div>
+      <div  class="small-2 column">
+        <%= version.created_at -%>
+      </div>
       <div  class="small-2 column">
         <%= version_modified_by version.whodunnit -%>
       </div>
-      <div  class="small-8 column">
-        <% if version.changeset.empty? %>
+      <div  class="small-6 column">
+        <% if version.changeset.nil? || version.changeset.empty? %>
           <em>empty</em>
         <% else %>
           <% version.changeset.each do |attribute, value| %>

data/app/views/inline_forms/record_destroyed.js.erb

@@ -0,0 +1 @@
+$('#<%= @update_span %>').fadeOut("slow")

data/bin/inline_forms_installer_core.rb

@@ -10,6 +10,7 @@ gem 'ckeditor', git: 'https://github.com/galetahub/ckeditor'
 #gem 'bootsnap', require: false
 gem 'coffee-rails'
 #gem 'compass-rails'
+gem 'rails-jquery-autocomplete'
 gem 'devise'
 gem 'foundation-icons-sass-rails'
 gem 'foundation-rails', '~> 5.5'

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "6.0.5"
+  VERSION = "6.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 6.0.5
+  version: 6.1.1
 platform: ruby
 authors:
 - Ace Suares
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -246,6 +246,7 @@ files:
 - app/views/inline_forms/extract_translations.erb
 - app/views/inline_forms/list.js.erb
 - app/views/inline_forms/new.js.erb
+- app/views/inline_forms/record_destroyed.js.erb
 - app/views/inline_forms/show.js.erb
 - app/views/inline_forms/show_element.js.erb
 - app/views/inline_forms/show_undo.js.erb