oxen_printer 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa5c49b87fd28334d19cf9290a170835f2d859b
-  data.tar.gz: 49031c378a4acec58684ada7981dcd2f6ada83cb
+  metadata.gz: af93710a84b071079b364de088730cdebcb7aa71
+  data.tar.gz: a678d74880a62ab8874489c572d53727854167bb
 SHA512:
-  metadata.gz: c61d1ba34ce9c021cef9e79ea37fc8a1dac011c90e70207ca0cd772604b614c52d89afa42c18ab00ebcdf25aa7b64a113b7aa8a3c5714c3cc962199cd0d18a22
-  data.tar.gz: 027c34df4ae72ee882e0e7ded1d799c9e9345be6305c7b269b89530325bf280b77992c123dfe132c5dee09c2ea3c54d11197102f67930a742c61e5dbc7d9de84
+  metadata.gz: 12bfe5401a1776f02763886c7fb972c320013a9f759fc2303640f7716f56c1bde1774966c3a479e66caa2e20fe77fd12b863d1a3f6ecf541a5493dccffb546f1
+  data.tar.gz: 16d328802e1ec41e27242a2aa76c2400a1e887d5271736b2afbbd03dfd6bfd80ad82b39ea2a5a12c17c35ef59d2edc9c3127d22e4ba96459fc01ff441c403c96

data/app/models/ox_printer.rb

@@ -13,18 +13,23 @@ class OxPrinter < AbstractResource
 
   scope :active, -> { where(active: true) }
   scope :preferred_printer, ->{ where("printables.preferred=1")}
-  scope :on_paper, -> (pap){ where(paper: pap )}
+  scope :on_paper, -> (pap){ where("paper LIKE :pap", pap: "%#{pap}%")}
 
   def list_title
     name
   end
 
+  def _ref
+    paper
+  end
+
   def preferred? parent
     printables.where(printable: parent).first.preferred?
   end
 
   def prefer parent
-    parent.printables.each{ |p| p.update_columns(preferred: false) }
+    ps = parent.printers.preferred_printer.on_paper(self.paper)
+    parent.printables.each{ |p| p.update_columns(preferred: false) if ps.include? p.printer }
     printables.where(printable: parent).first.update_columns( preferred: true )
   end
 

data/app/views/oxen/printers/_user_printer.html.haml

@@ -11,8 +11,8 @@
           %i.material-icons layers_clear
     %td
       - if user.printers.preferred_printer.include? printer
-        -#= link_to defer_url( user,printer), class: 'preferred green-text', title: t('defer_printers') do
-        %i.preferred.material-icons.green-text{ data: { id: printer.id }} bookmark
+        = link_to defer_url( user,printer), class: 'preferred green-text', ref: printer.paper, data: { id: printer.id }, title: t('defer_printers') do
+          %i.preferred.material-icons.green-text bookmark
       - else
-        = link_to prefer_url( user,printer), class: 'deferred grey-text', data: { id: printer.id },title: t('prefer_printers') do
+        = link_to prefer_url( user,printer), class: 'deferred grey-text', ref: printer.paper, data: { id: printer.id },title: t('prefer_printers') do
           %i.material-icons bookmark_border

data/lib/oxen_printer/version.rb

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

data/lib/print_engine.rb

@@ -61,6 +61,10 @@ module PrintEngine
       rescue PrintJobPrinterNotAvailableError
         logit :error, 'PrintJob could not be created - the user has no printers attached!!'
         return false
+
+      rescue NoPreferredPrintersFound
+        logit :error, 'PrintJob could not be created - the user has no preferred printers attached!!'
+        false
       end
 
       begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxen_printer
 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: oxen_job