approval2 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63eb8f62ec9ef31d1b8e8ae748720d6f3625e4e5
-  data.tar.gz: d94a300234cc6afc0b0eb2e2d7fa996a5ec842b9
+  metadata.gz: 5c160ff94c007a93967fa9e3437e0662ee679913
+  data.tar.gz: d64aeaab593e7498f67002a6eb862115d11d3f4e
 SHA512:
-  metadata.gz: 26c6e7d9d25aa4499db102f5a4009c636172f15cb0da272d460349cc3cd8ca81bddf1dcb2de143aa221c33f583dcf912f6a673517272004e288e4eecca61a38c
-  data.tar.gz: 8d41f124ba55c670e496532e358037e5aef16ee974248d2bf1b2433b6d7c7040ca0735554e78b2879461817360d259e2fe40f4257a914405600ab5d4cc0d86b7
+  metadata.gz: 4cf79b315085c0793603a689d19e0a2a45220680827c9472f462d82f61cae03f0e71dc6539045f544f9423dcbe1e8e738f22fd624926cf2f1a30516c973c62ea
+  data.tar.gz: c7a83ba157b57dc8323e390f3d90077df4dc738254c37cc84c54d7a72e80b8d7030a6229cbe4186e91a9b91292b7796dee47872f359f54833ad0269ff5f188d8

data/lib/approval2/controller_additions.rb

@@ -6,10 +6,29 @@ module Approval2
       before_filter :before_edit, only: :edit
       before_filter :before_approve, only: :approve
       before_filter :before_index, only: :index
+      
+      def reject
+        modelName = self.class.name.sub("Controller", "").underscore.split('/').last.singularize
+        modelKlass = modelName.classify.constantize        
+        x = modelKlass.unscoped.find(params[:id])
+        x.destroy if x.can_destroy?
+        flash[:alert] = "The unapproved record has been deleted"
+        redirect_with_params
+      end
+      
     end
 
 
     private 
+    
+    # apps can provide redirect params via a known session variable
+    def redirect_with_params
+      if session[:approval2_redirect_params].present?
+        redirect_to unapproved_records_path(session[:approval2_redirect_params])
+      else
+        redirect_to unapproved_records_path
+      end
+    end
 
     def before_index
       if (params[:approval_status].present? and params[:approval_status] == 'U')      
@@ -50,6 +69,9 @@ module Approval2
         end
       end
     end    
+    
+  
+  
   end
 end
 

data/lib/approval2/model_additions.rb

@@ -62,12 +62,19 @@ module Approval2
         return approved_record
       end    
     end
+    
+    def can_destroy?
+      # only unaproved records are allowed to be destroyed
+      self.approval_status == 'U'
+    end
+    
+    alias_method :enable_reject_button?, :can_destroy?
 
     def enable_approve_button?
       self.approval_status == 'U' ? true : false
     end
 
-      def on_create_create_unapproved_record_entry
+    def on_create_create_unapproved_record_entry
       if approval_status == 'U'
         UnapprovedRecord.create!(:approvable => self)
       end

data/lib/approval2/version.rb

@@ -1,3 +1,3 @@
 module Approval2
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

data/lib/generators/approval2/install/templates/_approve.html.haml

@@ -1,15 +1,26 @@
+- reject_url = polymorphic_path(@record, :action => 'reject') rescue nil
 - can = can? :approve, @record
 - approve_flag = @record.enable_approve_button?
+- reject_flag = @record.enable_reject_button?
 %a.btn{"data-toggle" => "modal", :href => "#{!(can && approve_flag) ? '#' : '#myModalApprove'}", :role => "button", :class => "btn btn-primary #{(can && approve_flag) ? '' : 'disabled'}"} Approve
+- if reject_url.present?
+  %a.btn{"data-toggle" => "modal", :href => "#{!(can && approve_flag) ? '#' : '#myModalReject'}", :role => "button", :class => "btn btn-primary #{(can && reject_flag) ? '' : 'disabled'}"} Reject
 .modal.hide.fade{"id" => "myModalApprove", "aria-hidden" => "true", "aria-labelledby" => "  myModalLabel", :role => "dialog", :tabindex => "-1"}
   .modal-header
     %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} ×
-    %h3#myModalLabel  Acknowledge
+    %h3#myModalLabel  Acknowledge Approval
     #error_message{:style => 'color:red'}
   .modal-body
-    = simple_form_for @record, :url => {:action => 'approve'}, :method => :put, :html=>{:id=>"transition"} do |ef|
+    = simple_form_for @record, :url => {:action => 'approve'}, :method => :put do |ef|
       = ef.input :updated_by, :as => :hidden, :input_html => {:value => current_user.id}
-      = submit_tag "Confirm", :class=>"btn btn-primary transition_button", :id => "transition_button"
+      = submit_tag "Confirm", :class=>"btn btn-primary transition_button"
+.modal.hide.fade{"id" => "myModalReject", "aria-hidden" => "true", "aria-labelledby" => "  myModalLabel", :role => "dialog", :tabindex => "-1"}
+  .modal-header
+    %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} ×
+    %h3#myModalLabel  Acknowledge Rejection
+    #error_message{:style => 'color:red'}
+  .modal-body
+    = link_to 'Confirm', reject_url, method: :put, :class=>"btn btn-primary transition_button"
 %p{:style => 'color:green;'}
   = created_or_edited_by(@record)
 %br

data/lib/generators/approval2/install/templates/unapproved_records_controller.rb

@@ -11,5 +11,10 @@ class UnapprovedRecordsController < ApplicationController
     end
 
     @records = result.paginate(:per_page => 10, :page => params[:page]) rescue []
+    
+    # the approval2 gem requires a known session variable to include any redirect params to be sent to the unapproved_records_path
+    # for the reject action
+    session[:approval2_redirect_params] = {param1: 'some_param', param2: 'some_other_param'}
+    
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: approval2
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - akil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler