formily 0.0.5.5.7 → 0.0.5.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b84fc2bb7f9473589b61bd8996d0ff5746aae335
-  data.tar.gz: 21a06152a3ab5e902fcd9d1faa45a763d7361d4f
+  metadata.gz: 966730c1ed08384468fff0f6840c15a866e41f23
+  data.tar.gz: a76f7649a99b0fb2dfc7fcf964ccfe53759c2371
 SHA512:
-  metadata.gz: 38308ce7f7d6f9394640108d5672a778e1aeab9632db18ed9f85f7abcf16716d4ba53e50773be43082c64cbb6157812e0293cad8df47666bbd45e8f8cefc822b
-  data.tar.gz: 8df0264eb76c96fe953fc88e231540d89be3bb2b8bb18bf6e4fb6fc4ec6b4646f0627824a0930f002fbb9f914545ca9baeda399f9d9e04404df01c87a5037dfe
+  metadata.gz: cc07e3d91213b72d5061b709d509606b85a623734f545e9346b36dddf86bead27745727e06527c09eb41d22280f57879aa5249c5184d462060580f61e3bc6a52
+  data.tar.gz: f30d8de78c624cc3777e22833de2b9b005869bf5e54733f89964303b9670d055780d7fbdc8a899b139afa25cbecaef2852208db0ca613a40ac3148327a01cbc4

data/app/assets/javascripts/formily/base/buttons.js

@@ -63,6 +63,25 @@ $(document).ready(function() {
     $('.formily-edit').remove();
   });
 
+  $(document).on('click', '#formily_delete', function(e){
+    if(isFormilyFileUploaded()){
+      var self = $(this);
+      var id = self.data('formilyDeleteResponseId');
+      var data = self.data('formilyResponse');
+
+      if(confirm('Are you sure you want to delete the form submission?')){
+        $.ajax({
+          url: FormilyRoutes.response_delete_path(id),
+          data: data,
+          type: 'DELETE',
+          success: function(){
+            closeWindowFunc('formily_update_table');
+          }
+        });
+      }
+    }
+  });
+
   $('#formily_form_tag').on('submit', function(e){
     var form = $(this);
 

data/app/assets/javascripts/formily/base/form_response.js

@@ -25,4 +25,25 @@ $(document).ready(function() {
     e.preventDefault();
   });
 
-});
+  $(document).on('click', 'span[data-formily-delete-response-id]', function(e){
+    var self = $(this);
+    var id = self.data('formilyDeleteResponseId');
+    var data = self.data('formilyResponse');
+
+    if(confirm('Are you sure you want to delete the form submission?')){
+      $.ajax({
+        url: FormilyRoutes.response_delete_path(id),
+        data: data,
+        type: 'DELETE',
+        success: function(){
+          $(document).trigger('formily_update_table', data);
+        },
+        error: function(resp){
+          console.error(resp.responseJSON.msg);
+          alert(resp.responseJSON.msg);
+        }
+      });
+    }
+    e.preventDefault();
+  });
+});

data/app/assets/javascripts/formily/formily_url.js.erb

@@ -22,5 +22,8 @@ window.FormilyRoutes = {
   },
   form_upload_file_path: function () {
     return "<%= url.upload_file_formily_submit_data_path %>";
-  }
-};
+  },
+  response_delete_path: function (id) {
+    return "<%= url.destroy_response_formily_submit_data_path(0).to_s[0...-1] %>" + id.toString();
+  },
+};

data/app/assets/stylesheets/formily/foundation_fix.scss

@@ -123,6 +123,12 @@ span.ff-icon-plus {
   cursor: pointer;
 }
 
+span.ff-icon-trash-empty {
+  position: relative;
+  cursor: pointer;
+  color: red;
+}
+
 .panel.warning {
   border-color: #f08a24;
 }

data/app/controllers/formily/forms_controller.rb

@@ -17,16 +17,9 @@ class Formily::FormsController < FormilyController
 
   def show
     @form = Formily::Form.find(params[:id])
-    model = params[:model_name].safe_constantize
-    @obj_rel = model.find(params[:model_id])
-
-    @submit = @form.submits.find_by(id: params[:submit_id])
-
-    if @submit.blank?
-      @submit = Formily::Submit.create({form_id: @form.id, resource_id: params[:model_id],
-                                        user_id: params[:user_id], resource_type: params[:model_name]})
-    end
-
+    form_model = params[:model_name].safe_constantize
+    @obj_rel = form_model.find(params[:model_id])
+    @submit = @form.find_or_create_submission_by(params)
   end
 
   def edit
@@ -90,7 +83,6 @@ class Formily::FormsController < FormilyController
     render partial: 'preview', layout: false, locals: {:@form => form, :@obj_rel => form, :@submit => submit}
   end
 
-
   def reload_formily_table
     user_id = params[:user_id]
     obj_rel = params[:resource_type].safe_constantize.find(params[:resource_id])
@@ -98,7 +90,6 @@ class Formily::FormsController < FormilyController
     render locals: {obj_rel: obj_rel, user_id: user_id, flag: params[:flag].present?}, layout: false
   end
 
-
   def add_new_response
     submit = Formily::Submit.where(params.permit(:form_id, :resource_id, :user_id, :resource_type))
                .order(created_at: :desc).first

data/app/controllers/formily/iframe/forms_controller.rb

@@ -1,28 +1,18 @@
 # coding: utf-8
 class Formily::Iframe::FormsController < FormilyController
-
   def show
     @form = Formily::Form.find(params[:id])
-
-    model = params[:model_name].safe_constantize
-
-    @obj_rel = model.blank? ? nil : model.find(params[:model_id])
-
-    @submit = @form.submits.find_by(id: params[:submit_id])
-
-    if @submit.blank?
-      @submit = Formily::Submit.create({form_id: @form.id, resource_id: params[:model_id],
-                                        user_id: params[:user_id], resource_type: params[:model_name]})
-    end
+    form_model = params[:model_name].safe_constantize
+    @obj_rel = form_model.blank? ? nil : form_model.find(params[:model_id])
+    @submit = @form.find_or_create_submission_by(params)
   end
 
   def add
   end
 
-
   private
-    def formily_layout
-      'formily_iframe'
-    end
 
-end
+  def formily_layout
+    'formily_iframe'
+  end
+end

data/app/controllers/formily/submit_data_controller.rb

@@ -137,6 +137,13 @@ class Formily::SubmitDataController < FormilyController
     end
   end
 
+  def destroy_response
+    submit = Formily::Submit.find(params[:id])
+    submit.destroy
+
+    render json: {}, status: :ok
+  end
+
   private
     def set_layout
       if params[:iframe]

data/app/models/formily/form.rb

@@ -25,6 +25,12 @@ class Formily::Form < ActiveRecord::Base
     '#response'
   end
 
+  def find_or_create_submission_by(attributes)
+    submission = submits.find_by(id: attributes[:submit_id])
+    submission ||= submits.find_by(resource_id: attributes[:model_id], user_id: attributes[:user_id], resource_type: attributes[:model_name])
+    submission ||= submits.create(resource_id: attributes[:model_id], user_id: attributes[:user_id], resource_type: attributes[:model_name])
+  end
+
   private
 
     def delete_data

data/app/models/formily/submit.rb

@@ -5,6 +5,8 @@ class Formily::Submit < ActiveRecord::Base
 
   has_paper_trail
 
+  after_destroy :delete_data
+
   belongs_to :form
   has_many :input_values, foreign_key: :submit_id, class_name: 'Formily::InputValue', dependent: :destroy
 
@@ -44,4 +46,9 @@ class Formily::Submit < ActiveRecord::Base
     end
   end
 
-end
+  private
+
+  def delete_data
+    input_values.destroy_all
+  end
+end

data/app/views/formily/helpers/_related_forms_tr.html.haml

@@ -4,12 +4,13 @@
 
   - submits = [nil] if submits.blank?
 
+  - p = {user_id: user_id, authenticity_token: form_authenticity_token, form_id: form.id, resource_id: obj_rel.id, resource_type: obj_rel.class.to_s}
+
   - submits.each_with_index do |submit, i|
 
     %tr{'data-formily-form-id' => form.id}
       %td.icon
         - if i == 0
-          - p = {user_id: user_id, authenticity_token: form_authenticity_token, form_id: form.id, resource_id: obj_rel.id, resource_type: obj_rel.class.to_s}
           %span.ff-icon-plus{title: 'Add New Response', 'data-tooltip'=> (browser.device.ipad? ? nil : ''), 'data-formily-new-response' => p.to_json, 'data-href' => add_new_response_formily_forms_path}
       %td.icon
         - if submit && submit.input_values.count > 0
@@ -25,4 +26,8 @@
         = show_formily_form_link_tag form.id, obj_rel, submit.try(:id) , user_id, title, class: 'response'
 
         - if form.description.present?
-          %span.has-tip.tip-top{'data-tooltip'=> '', 'aria-haspopup'=>true, title: form.description} ?
+          %span.has-tip.tip-top{'data-tooltip'=> '', 'aria-haspopup'=>true, title: form.description} ?
+
+      %td.icon
+        - if submit.present?
+          %span.ff-icon-trash-empty{title: 'Delete Response', 'data-tooltip'=> (browser.device.ipad? ? nil : ''), 'data-formily-delete-response-id' => submit.id, 'data-formily-response' => p.to_json}

data/app/views/formily/partial/_form.haml

@@ -34,4 +34,7 @@
 
     %input.button.tiny#formily_cancel{type: 'button', value: 'Cancel', title: 'Cancel'}
 
+    - p = {user_id: @user_id, authenticity_token: form_authenticity_token, form_id: @form.id, resource_id: @obj_rel.id, resource_type: @obj_rel.class.to_s}
+    %input.button.tiny.alert#formily_delete{type: 'button', value: 'Delete', title: 'Delete', 'data-formily-delete-response-id' => @submit.id, 'data-formily-response' => p.to_json}
+
     .formily-spinner

data/config/routes.rb

@@ -26,6 +26,7 @@ Rails.application.routes.draw do
       collection do
         post 'submit', action: :submit
         post 'upload_file', action: :upload_file
+        delete 'destroy_response/:id', action: :destroy_response, as: :destroy_response
       end
     end
 

data/lib/formily/version.rb

@@ -1,4 +1,4 @@
 # coding: utf-8
 module Formily
-  VERSION = '0.0.5.5.7'
+  VERSION = '0.0.5.5.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formily
 version: !ruby/object:Gem::Version
-  version: 0.0.5.5.7
+  version: 0.0.5.5.9
 platform: ruby
 authors:
 - Alex
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler