effective_organizations 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ed8ea76f6be605f32e951431171d7be4d5c9885adf3adaa51ebd223ad2faa95
-  data.tar.gz: '08a0fa735dc997d95203d90abd6c5657855b6e957b00802800222cf8cfe00d5c'
+  metadata.gz: 2ce60402fb05740c64591e80c230f056c38f2de281f46535ac9a28830a3bd15d
+  data.tar.gz: 983747000777d6a206be7b703885c5826407fcbff1a25c540f99d7869a3328cc
 SHA512:
-  metadata.gz: 31c96c8af942654f9d314326363228f2cead96f47cd0f7e32f256d7a2362e7e5601bdeb35be78c5bf102c8bfa21d6adfe61664cb991e1d10effe2de937aeef36
-  data.tar.gz: 62ebff63f53a735bb6d185648611d40f717dd469ea03f7f5cb62be5c6027d0248f10f77a38fc8ae2f8bea82d3c2eac9887ead68d847c8fffecaf71032d83d399
+  metadata.gz: eed049b33149af44daf3d148f4dce7398c26a9b5777c157c2587332edefd86059ea377fae4825ad858f3687dc20c7e2c4d63d2f58ff8f940f70a899079ab4dd3
+  data.tar.gz: 2d66e0a1b52951e3e5e9c73d623ea1df9ba92cadf8bc2b63efc7abd0892cb79e8764b74f1b97458e8e15eec7b06300997a84e822378b3983a427b4601ff7daca

data/app/datatables/effective_representatives_datatable.rb

@@ -5,8 +5,10 @@ class EffectiveRepresentativesDatatable < Effective::Datatable
     col :organization
     col :user
 
-    col :email do |representative|
-      mail_to(representative.user.email)
+    unless attributes[:user_id]
+      col :email do |representative|
+        mail_to(representative.user.email)
+      end
     end
 
     col :roles, search: roles_collection

data/app/models/concerns/effective_organizations_organization.rb

@@ -32,10 +32,15 @@ module EffectiveOrganizationsOrganization
 
     effective_resource do
       title                 :string
+      email                 :string
+
       category              :string
 
       notes                 :text
 
+      roles_mask            :integer
+      archived              :boolean
+
       representatives_count :integer # Counter cache
 
       timestamps
@@ -48,6 +53,9 @@ module EffectiveOrganizationsOrganization
   end
 
   # Instance Methods
+  def to_s
+    title.presence || 'organization'
+  end
 
   def representative(user:)
     representatives.find { |rep| rep.user_id == user.id }

data/app/models/effective/representative.rb

@@ -26,6 +26,11 @@ module Effective
       user.password ||= SecureRandom.base64(12) + '!@#123abcABC-'
     end
 
+    after_commit(on: [:create, :destroy], if: -> { user.class.respond_to?(:effective_memberships_owner?) }) do
+      user.representatives.reload
+      user.update_member_role!
+    end
+
     validates :organization, presence: true
     validates :user, presence: true
 

data/app/views/admin/organizations/_form_organization.html.haml

@@ -5,5 +5,5 @@
 
 - if organization.persisted?
   %h2 Representatives
-  - datatable = Admin::EffectiveRepresentativesDatatable.new(organization_id: organization.id, organization_type: organization.class.name)
+  - datatable = Admin::EffectiveRepresentativesDatatable.new(organization: organization)
   = render_inline_datatable(datatable)

data/config/effective_organizations.rb

@@ -6,7 +6,7 @@ EffectiveOrganizations.setup do |config|
   # Configure the Layout per controller, or all at once
   # config.layout = { application: 'application', admin: 'admin' }
 
-  # Membership Categories Settings
+  # Organization Settings
   # Configure the class responsible for the organization.
   # config.organization_class_name = 'Effective::Organization'
 end

data/config/routes.rb

@@ -12,7 +12,11 @@ EffectiveOrganizations::Engine.routes.draw do
   end
 
   namespace :admin do
-    resources :organizations, except: [:show]
+    resources :organizations, except: [:show, :destroy] do
+      post :archive, on: :member
+      post :unarchive, on: :member
+    end
+
     resources :representatives, except: [:show]
   end
 

data/db/migrate/01_create_effective_organizations.rb.erb

@@ -1,23 +1,28 @@
 class CreateEffectiveOrganizations < ActiveRecord::Migration[6.0]
   def change
     # Organizations
-    create_table :organizations do |t|
+    create_table <%= @organizations_table_name %> do |t|
       t.string    :title
 
       t.string    :category
+      t.string    :email
       t.text      :notes
 
-      t.integer :representatives_count, default: 0
+      t.integer   :roles_mask
+      t.boolean   :archived, default: false
+
+      t.integer   :representatives_count, default: 0
 
       t.datetime :updated_at
       t.datetime :created_at
     end
 
-    add_index :organizations, :title
+    add_index <%= @organizations_table_name %>, :title
 
     # Representatives
-    create_table :representatives do |t|
+    create_table <%= @representatives_table_name %> do |t|
       t.integer :organization_id
+      t.string :organization_type
 
       t.integer :user_id
       t.string :user_type
@@ -28,8 +33,8 @@ class CreateEffectiveOrganizations < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    add_index :representatives, [:organization_id]
-    add_index :representatives, [:user_id, :user_type]
+    add_index <%= @representatives_table_name %>, [:organization_id, :organization_type]
+    add_index <%= @representatives_table_name %>, [:user_id, :user_type]
 
   end
 end

data/lib/effective_organizations/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrganizations
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_organizations
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails