abstracted 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6858c1c6cc52f262eb7ff058188474ec419890bd
-  data.tar.gz: 8bb94db2212e137053e04396e0f13913f83abfd7
+  metadata.gz: aff5b25e98fbac0db0277def4b26dac60ade157e
+  data.tar.gz: 900baf74932298877889d24f5398b07cc60f217f
 SHA512:
-  metadata.gz: 71edad58522f01e10586aa5a096ffad64ca6e6c42ae3193939e3c09d7ee573df751aef81ec7ebf8d78d71301f64c44892cbc09d520867c15c90d4943b0d250c2
-  data.tar.gz: faea0155df6b1e166fe0995bdd9ed947b813a1ba3d71ab772ed3a7c7e741bb29ea8df62c223fe42029a91c0b85e90ef2964901755b93108c9d9db42ee1981e7a
+  metadata.gz: f6b21d0f05200e511c0545614298932effbdac83fd6a8c18199d92be0957c8c50acd1156a7f3411648f80def83139c0d3466a9c22e3d988e72fb46e08cf0be1f
+  data.tar.gz: b04bfc2af2be21c664f698dacf1a894711cc42934e03d2850c2f056998649d5352c4a109e92bd9c55edd3a279b452fb8c59293e0d6bae62daa05d8028c2ac560

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

@@ -156,24 +156,55 @@ class App.ResourcesList
 
   #
   # handlePreferredLinks
-  # allows for activating/deactivating resources - like: /admin/users/2/activate
+  # allows for preferring/deferring resources - like: /admin/printers/2/prefer & /admin/printers/2/defer
   #
   handlePreferredLinks: (e) =>
     e.preventDefault()
     e.stopPropagation()
 
     $elem = $(e.currentTarget)
+    # are we preferring?
+    prefer = $elem.attr('href').match /prefer/
     request = $.ajax
       url: $elem.attr('href'),
       type: "get",
       dataType: 'html'
     .done (data) =>
-      # here we have to write all the existing preferred ones
-      $.when $('i.preferred').each (k,e) =>
-        $e = $(e)
-        $( $e[0].parentElement).html( data.replace /{{id}}/, $e.data('id'))
-      # $( $elem[0].parentElement).html(data)
-      .then $( $elem[0].parentElement).html('<i class="preferred material-icons green-text" data-id="' + $elem.data('id') + '">bookmark</i>')
+      if prefer
+        sel='a.preferred'
+        if $elem.attr('ref')!=undefined
+          sel='a.preferred[ref="x"]'.replace /x/, $elem.attr('ref')
+        $(sel).each (k,e) =>
+          $e=$(e)
+          if $e!=$elem
+            url=$e.attr('href').replace 'defer', 'prefer'
+            $e.attr 'href', url
+            $e.html '<i class="deferred material-icons grey-text">bookmark_border</i>'
+
+      $elem.html(data)
+      # if prefer
+      #   sel='a.preferred'
+      #   if $elem.attr('ref')!=undefined
+      #     sel='a.preferred[ref="x"]'.replace /x/, $elem.attr('ref')
+      #
+      #   $(sel).each (k,e) =>
+      #     $e = $(e)
+      #     if $e != $elem
+      #       console.log $e
+      #       $e.attr('href').replace 'defer', 'prefer'
+      #       $e.html '<i class="deferred material-icons grey-text">bookmark_border</i>'
+      #
+      #   $elem.html '<i class="preferred material-icons green-text">bookmark</i>'
+
+
+      # # here we have to write all the existing preferred ones
+      # $.when $(sel).each (k,e) =>
+      #   $e = $(e)
+      #   $e.attr('href').replace 'defer', 'prefer'
+      #   $e.html '<i class="deferred material-icons grey-text">bookmark_border</i>'
+      #   # $( $elem[0].parentElement).html(data)
+      # .then $elem.html '<i class="preferred material-icons green-text">bookmark</i>'
+
 
     .error (data) =>
       swal("Oops", "We couldn't connect to the server!", "error")

data/app/helpers/abstract_resources_helper.rb

@@ -161,7 +161,7 @@ module AbstractResourcesHelper
   end
 
   def defer_url parent, resource
-    '%s/%s/%s/defer' % [url_for( parent), resource.class.to_s.downcase.pluralize, "{{id}}"]
+    '%s/%s/%s/defer' % [url_for( parent), resource.class.to_s.downcase.pluralize, resource.id]
   end
 
 

data/app/views/abstract_resources/defer.html.haml

@@ -1,5 +1,5 @@
-= link_to prefer_url( parent,resource), class: 'deferred green-text', title: t('prefer_%s' % resource_name) do
-  %i.material-icons bookmark_border
+= link_to prefer_url( parent,resource), class: 'deferred grey-text', ref: resource._ref, data: { id: resource.id }, title: t('prefer_%s' % resource_name) do
+  %i.material-icons.deferred.grey-text bookmark_border
 
 :javascript
   eval("#{set_toasts}");

data/app/views/abstract_resources/prefer.html.haml

@@ -1,5 +1,5 @@
-= link_to prefer_url( parent,resource), class: 'deferred grey-text', title: t('prefer_%s' % resource_name) do
-  %i.material-icons bookmark_border
+= link_to defer_url( parent,resource), class: 'preferred green-text', ref: resource._ref, data: { id: resource.id }, title: t('prefer_%s' % resource_name) do
+  %i.material-icons.preferred.green-text bookmark
 
 :javascript
   eval("#{set_toasts}");

data/lib/abstracted/version.rb

@@ -1,3 +1,3 @@
 module Abstracted
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

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