abstracted 0.4.17 → 0.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3768a2fd0bc32496836612516717cd03550edb9a
-  data.tar.gz: a57bc2f9df972dc31cc87d696a111c36c6d67cf3
+  metadata.gz: 28a297762d066864f6f4c3da7e4dc34996d046c7
+  data.tar.gz: 74259d425c5d4d14e5bd4636ddd8be149eef7a73
 SHA512:
-  metadata.gz: f8b7ed7d8e12fdd28b00ff5a8067b2847a751e4faf81e71c6e6207b4521031901108027d2c46b8d881abf6b47ca49ed956d1a4780b3a49302f64338c5d46bed6
-  data.tar.gz: 07263ffc2f2fa4eb11733b12aa89ec48fbbb27ac3a665c407c365c102a3548bd0173da12645623db33724abae22f047a98d40bbf0aa34de53b5beaba44a683ea
+  metadata.gz: 6fd3299a894de29a3f0b23f0c0ef6c7e6de39e6e53f98275617ae895b7a543aafd16501d6b0a9a03031ffc384fd039c518a1918c64d55acedd6f8f7b2d6d4a27
+  data.tar.gz: afe97506115e9d7567bcd129bbc08556649b41c56145eeebf079f89b687c6d7248c80fdddd39eed784ebc0d363629d78837f577394bf6b55e7bf08c6d61f9242

data/app/controllers/abstract_resources_controller.rb

@@ -226,7 +226,11 @@ class AbstractResourcesController < ApplicationController
       @fab_button_options = opt
     end
 
-
+    def caught_an_error_already?
+      result = @caught_an_error_already
+      @caught_an_error_already ||= true 
+      result
+    end
 
     def scoop_from_error e
 
@@ -240,6 +244,7 @@ class AbstractResourcesController < ApplicationController
         flash.now[:error] = flash[:error] = "Access Problem: <br/><small>%s</small>" % e.message
         result= false
         status = 412
+        a_url = resources_url
 
       when "ActiveRecord::RecordNotFound"
         flash.now[:error] = flash[:error] = t('.fail.record_not_found')
@@ -251,15 +256,19 @@ class AbstractResourcesController < ApplicationController
         flash.now[:error] = flash[:error] = t('.fail.authorized', resource: resource)
         result = false
         status = 401
+        a_url = resources_url
 
       when "ActiveRecord::StatementInvalid" # Mysql2::Error
         flash.now[:error] = flash[:error] = t('fail.mysql_error', mysql: e.to_s)
         result= false
         status = 409
+        a_url = resources_url
+
       when "ActionView::Template::Error"
         flash.now[:error] = flash[:error] = "A template error occured - please call ALCO with: <br/><small>%s</small>" % e.message
         result= false
         status = 301
+        a_url = resources_url
 
       # when "PrintJobNotCreatedError"
       #
@@ -280,12 +289,12 @@ class AbstractResourcesController < ApplicationController
         raise e
         # flash.now[:error] = flash[:error] = "An error occured - please refer to log for details!"
         # render :error, layout: false, status: 412 and return
-      end
-
+      end unless caught_an_error_already?
+      
       respond_to do |format|
         case params[:action]
         when 'new'
-          format.html { flash.keep(:error) ; redirect_to resources_url }
+          format.html { flash.keep(:error) ; redirect_to a_url }
           format.js   { render :error, layout: false, status: status, locals: { result: result} }
           format.json { render json: resources, status: status }
         when 'create'
@@ -293,11 +302,11 @@ class AbstractResourcesController < ApplicationController
           format.js   { render :error, layout: false, status: status, locals: { result: result} }
           format.json { render json: resource.errors, status: status }
         when 'show'
-          format.html { flash.keep(:error) ; redirect_to resources_url }
+          format.html { flash.keep(:error) ; redirect_to a_url }
           format.js   { render :error, layout: false, status: status, locals: { result: result} }
           format.json { render json: resources, status: status }
         when 'edit'
-          format.html { flash.keep(:error) ; redirect_to resources_url }
+          format.html { flash.keep(:error) ; redirect_to a_url }
           format.js   { render :error, layout: false, status: status, locals: { result: result} }
           format.json { render json: resources, status: status }
         when 'update'

data/app/controllers/concerns/resource_control.rb

@@ -95,7 +95,7 @@ module ResourceControl
       when 'create','update','delete','destroy'; ""
       else resource_options(options)
     end
-    return "%s%s" % [r,options] if r.match "#{resource.class.to_s.tableize}\/#{id}$"
+    return "%s%s" % [r,options] if r.match "#{resource_class.to_s.tableize}\/#{id}$"
     "%s%s" % [ r.split("/#{params[:action]}")[0], options]
   rescue Exception => e
     scoop_from_error e
@@ -110,8 +110,8 @@ module ResourceControl
       when 'create','update','delete','destroy'; ""
       else resource_options(options)
     end
-    return "%s%s" % [r,options] if r.match "#{resource.class.to_s.tableize}$"
-    "%s%s%s" % [ r.split( resource.class.to_s.tableize)[0],resource.class.to_s.tableize, options]
+    return "%s%s" % [r,options] if r.match "#{resource_class.to_s.tableize}$"
+    "%s%s%s" % [ r.split( resource_class.to_s.tableize)[0],resource_class.to_s.tableize, options]
   rescue Exception => e
     scoop_from_error e
   end

data/app/policies/abstract_resource_policy.rb

@@ -55,6 +55,10 @@ class AbstractResourcePolicy
     # @current_user.admin?
     true
   end
+  
+  def delete?
+    true
+  end
 
   def attach?
     true

data/lib/abstracted/version.rb

@@ -1,3 +1,3 @@
 module Abstracted
-  VERSION = "0.4.17"
+  VERSION = "0.4.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstracted
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.4.18
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-25 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails