oxen_account 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44af386a312bea365aca53bdbab138a167cf227f
-  data.tar.gz: f1033fc29f9726c8aa01a19f55033f968f4572ef
+  metadata.gz: 666da68d53db9bfbfbadecb22f0f56f0d12e69e9
+  data.tar.gz: d560092381692a5499caafb1f603a62c31d4c60a
 SHA512:
-  metadata.gz: 42fbce935c1baf7f858aea30e6a23f5ba617202a82f0cb0891b5afafa427c6b44a0f36da4c66c78b7f6d6519ad763cdbcdf828c213513353ca6d517558ed4777
-  data.tar.gz: 434c450524d269ce1aaf78f399904876d098c722a1a0bb35aaf98a3542d8a41a5a243c72b9c59d20ec62ec907bcffb12b63b59150408f63d87c698f89ad594c9
+  metadata.gz: 420b2f45bff090411c5e56258699a4ce541179e662e069b5313e9de86375bc39d03219f8bd18b775858b13cdb1ee8bc27d6517161ece9bbc3aeaf7e686c6a2be
+  data.tar.gz: 1bff19ead4610bb11845467953c3cc1bba8b0363e07f438a1cb827abaa2cd1fd81d02e782dfe259d42f6ab767145e61caf93596dbbecced41e6715f64fd906d5

data/app/models/ox_account.rb

@@ -5,6 +5,7 @@ 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}-#{resource.id}"}
+%tr{ id: "tr-#{resource.class.to_s}-#{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{ id: "tr-#{user.id}", class:"#{invited_user? user}"}
+%tr.post{ id: "tr-#{user.class.to_s}-#{user.id}", class:"#{invited_user? user}"}
   %td= link_to user.name, user
   %td= user.email
   %td= show_resource_active user
@@ -9,6 +9,4 @@
       = link_to url_for(user) + '/confirm', class: "unconfirmed yellow-text" do
         = content_tag :i, 'report_problem', class: "material-icons"
   %td= user.invitations.count
-  %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= show_resource_delete_icon user, '/admin/users'

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

@@ -1,9 +1,10 @@
-%tr{ id: "tr-#{user.id}", class:"#{invited_user? user}"}
+%tr.post{ id: "tr-#{resource_class.to_s}-#{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
-    = 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= 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/lib/generators/oxen_account/templates/address.rb

@@ -0,0 +1,17 @@
+class CreateAddresses < ActiveRecord::Migration
+  def change
+    create_table :addresses do |t|
+      t.references :account, index: true
+      t.string :building
+      t.string :house_number
+      t.string :street
+      t.string :zipcode
+      t.string :city
+      t.string :country
+      t.integer :lock_version
+
+      t.timestamps null: false
+    end
+    add_foreign_key :addresses, :accounts
+  end
+end

data/lib/generators/oxen_account/templates/uri.rb

@@ -0,0 +1,17 @@
+class CreateUris < ActiveRecord::Migration
+  def change
+    create_table :uris do |t|
+      t.references :account, index: true
+      t.references :uriable, polymorphic: true, index: true
+      t.string :uri_label
+      t.string :uri
+      t.string :uri_protocol
+      t.boolean :preferred
+      t.integer :position
+
+      t.integer :lock_version
+      t.timestamps null: false
+    end
+    add_foreign_key :uris, :accounts
+  end
+end

data/lib/oxen_account/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxen_account
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Walther H Diechmann
@@ -345,6 +345,8 @@ files:
 - config/routes.rb
 - lib/generators/oxen_account/account_generator.rb
 - lib/generators/oxen_account/templates/account.rb
+- lib/generators/oxen_account/templates/address.rb
+- lib/generators/oxen_account/templates/uri.rb
 - lib/generators/oxen_account/templates/user_permission.rb
 - lib/oxen_account.rb
 - lib/oxen_account/engine.rb