oxen_account 0.4.9 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b84b5ee4c3f2036c10fcde8157fd75411b40ecc9
-  data.tar.gz: c29465615c163cf30fd1fb6395be4de17ce5d13a
+  metadata.gz: 44af386a312bea365aca53bdbab138a167cf227f
+  data.tar.gz: f1033fc29f9726c8aa01a19f55033f968f4572ef
 SHA512:
-  metadata.gz: bf53a3a7daba52e3448cde4f5c649666c4f90934f2140b60e0b114a44d8535610d2919bff28a981c6703d7eadcd62ea64b4243b391a0066b8ddf9e908fa3eab3
-  data.tar.gz: eecccd31888c5519c936c51a221ceb8c7b0a5a7942db2413710bd018f84e850e6fd91159aa01fecf3139fa7a81d727d72a9245ae986c98561a44698319e209ed
+  metadata.gz: 42fbce935c1baf7f858aea30e6a23f5ba617202a82f0cb0891b5afafa427c6b44a0f36da4c66c78b7f6d6519ad763cdbcdf828c213513353ca6d517558ed4777
+  data.tar.gz: 434c450524d269ce1aaf78f399904876d098c722a1a0bb35aaf98a3542d8a41a5a243c72b9c59d20ec62ec907bcffb12b63b59150408f63d87c698f89ad594c9

data/app/models/ox_account.rb

@@ -5,7 +5,6 @@ class OxAccount < AbstractResource
 
   has_many :users, dependent: :destroy, foreign_key: 'account_id'
   has_many :printers, dependent: :destroy, foreign_key: 'account_id'
-  has_many :printservers, dependent: :destroy, foreign_key: 'account_id'
   has_many :services, dependent: :destroy, foreign_key: 'account_id'
 
   validates :name, presence: true

data/app/views/oxen/accounts/_account.html.haml

@@ -1,4 +1,4 @@
-%tr{ id: "tr-#{resource.class.to_s}-#{resource.id}"}
+%tr{ id: "tr-#{resource_class}-#{resource.id}"}
   %td= link_to resource.name, resource
   %td= show_resource_active resource
   %td= show_print_servers resource

data/app/views/users/_account_user.html.haml

@@ -1,4 +1,4 @@
-%tr.post{ id: "tr-#{user.class.to_s}-#{user.id}", class:"#{invited_user? user}"}
+%tr{ id: "tr-#{user.id}", class:"#{invited_user? user}"}
   %td= link_to user.name, user
   %td= user.email
   %td= show_resource_active user
@@ -9,4 +9,6 @@
       = link_to url_for(user) + '/confirm', class: "unconfirmed yellow-text" do
         = content_tag :i, 'report_problem', class: "material-icons"
   %td= user.invitations.count
-  %td= show_resource_delete_icon user, '/admin/users'
+  %td
+    = link_to user, class: 'delete_link', data: { url: '/admin/users', name: "#{user.name}", id: "#{user.id}", remove: "#tr-#{user.id}" } do
+      %i.material-icons.small{ title: "#{t('.delete')}"} delete

data/app/views/users/_user.html.haml

@@ -1,10 +1,9 @@
-%tr.post{ id: "tr-#{resource_class.to_s}-#{user.id}", class:"#{invited_user? user}"}
+%tr{ id: "tr-#{user.id}", class:"#{invited_user? user}"}
   %td= link_to user.name, user
   %td= link_to( user.account.name, user.account) rescue ''
   %td= user.email rescue ''
   %td= show_resource_active user
   %td= user.invitations.count
-  %td= show_resource_delete_icon user, '/admin/users'
-  -# %td
-  -#   = link_to user, class: 'delete_link', data: { url: '/admin/users', name: "#{user.name}", id: "#{user.id}", remove: "#tr-#{user.id}" } do
-  -#     %i.material-icons.small{ title: "#{t('.delete')}"} delete
+  %td
+    = link_to user, class: 'delete_link', data: { url: '/admin/users', name: "#{user.name}", id: "#{user.id}", remove: "#tr-#{user.id}" } do
+      %i.material-icons.small{ title: "#{t('.delete')}"} delete

data/lib/oxen_account/version.rb

@@ -1,3 +1,3 @@
 module OxenAccount
-  VERSION = "0.4.9"
+  VERSION = "0.4.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxen_account
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.11
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise