abstracted 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 126d1cd4e89c93ac07929e52aa4a35abd2a477c3
-  data.tar.gz: 9111e931986fb61eb9634f07cf2b06fd17ce133d
+  metadata.gz: 7e28497f5dcb13484e39e4026ca57cd80b0f00b3
+  data.tar.gz: 8e79d388b823765605580f038f2105d92786badc
 SHA512:
-  metadata.gz: 939779fe24a353dee797444d606eb092609814c0d1032fb592106141e31d4f8f2c899cfb24af280a243cf88b019d06a937c2683f7f9147bd9442acb74799dac7
-  data.tar.gz: d58a5e87965fb85d9a0823fbc193da4d9c0ef110c89dc68dd072323abc45e99f68329f5aa8c50c2cd4d0371439e10d3ddec33e212c3e184f02793847c7e3f0a4
+  metadata.gz: 3b3ce59ae763bdfa82df047def8e5d75e86595ebf3ec6a23f67e4548966d4181f5ee8d4404c4d5cfbc7d9480a919a1c3e249ef3e0824498eb3332e0cad3e0596
+  data.tar.gz: e8d26a8375c198c8064302b32f26a375cfa0bcdf7d6755e2f83fbbdb2f22c7ef16ef259ad15967770588ea62753163017d9f37f8be02ac823342984160455131

data/app/assets/javascripts/abstracted/app.fab_delete.coffee

@@ -28,41 +28,41 @@ class App.fabDelete
         url: url,
         type: "delete",
         dataType: 'html'
-      .done (data) ->
+      .done (data) =>
         if $remove
           $remove.hide()
         @closeSweetAlert($elem)
         #swal("Deleted!", "Your file was successfully deleted!", "success")
-      .error (data) ->
+      .fail (data) =>
         $elem.show()
         swal("Oops", "We couldn't connect to the server!", "error")
-        #
-        # statusCode:
-        #
-        #   200: (response,textStatus,jqXHR) ->
-        #     closeSweetAlert()
-        #     tellResponse response.responseText
-        #
-        #
-        #   301: () ->
-        #     $elem.show()
-        #     closeSweetAlert()
-        #     swal "Ikke slettet!", "Posten blev ikke slettet - årsagen ikke kendt", "warning"
-        #
-        #   401: (response) ->
-        #     tellResponse response.responseText
-        #     closeSweetAlert()
-        #
-        #   409: (response) ->
-        #     tellResponse response.responseText
-        #     closeSweetAlert()
-        #
-        #   412: () ->
-        #     closeSweetAlert()
-        #     swal "Øv!", "Et eller andet gik galt!", "error"
 
     catch error
       swal "Hmmm", "Most unexpected! \n#{error}", "error"
+      #
+      # statusCode:
+      #
+      #   200: (response,textStatus,jqXHR) ->
+      #     closeSweetAlert()
+      #     tellResponse response.responseText
+      #
+      #
+      #   301: () ->
+      #     $elem.show()
+      #     closeSweetAlert()
+      #     swal "Ikke slettet!", "Posten blev ikke slettet - årsagen ikke kendt", "warning"
+      #
+      #   401: (response) ->
+      #     tellResponse response.responseText
+      #     closeSweetAlert()
+      #
+      #   409: (response) ->
+      #     tellResponse response.responseText
+      #     closeSweetAlert()
+      #
+      #   412: () ->
+      #     closeSweetAlert()
+      #     swal "Øv!", "Et eller andet gik galt!", "error"
 
 
 

data/app/controllers/abstract_resources_controller.rb

@@ -332,8 +332,9 @@ class AbstractResourcesController < ApplicationController
   def resources_url options={}
     options = resource_options(options)
     r = "%s_path" % resource_name
-    r = send(r)
-    [ parent_url, r  ].join("/").gsub /\/\//,'/'
+    d,a,r = send(r).split("/")
+    a = a =~ /admin/ ? [ '/',a, parent_url ].join("/") : parent_url
+    [ a, r  ].join("/").gsub /\/\//,'/'
   rescue Exception => e
     scoop_from_error e
   end

data/app/helpers/abstract_resources_helper.rb

@@ -199,7 +199,7 @@ module AbstractResourcesHelper
 
   # return a link to delete a row
   def show_resource_delete_icon item, url, lbl='name'
-    link_to item, class: 'delete_link', data: { url: url, name: "#{item.send lbl }", id: "#{item.id}", remove: "#tr-#{item.id}" } do
+    link_to item, class: 'delete_link', data: { url: url, name: "#{item.send lbl }", id: "#{item.id}", remove: "#tr-#{item.class.to_s}-#{item.id}" } do
       content_tag :i, 'delete', class: 'material-icons small', title: "#{t('.delete')}"
     end
     # = link_to account, class: 'delete_link', data: { url: '/admin/accounts', name: "#{account.name}", id: "#{account.id}", remove: "#tr-#{account.id}" } do

data/lib/abstracted/version.rb

@@ -1,3 +1,3 @@
 module Abstracted
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

metadata

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