effective_organizations 0.0.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cacbee4a7dd40f4151038a00c39b0e7ef134f0ec739ee29753bc8aa34a73dc8c
-  data.tar.gz: 38e3039961b2ff7ceff0b66090370c9ace3f54ab6f16c666cdc68ca82b699d03
+  metadata.gz: f389ae4c41e7cdfdad7b45438d609e856120588a41349f646d01642a05b201fe
+  data.tar.gz: 154421f7cf8f595dbd94e97e58d6518e7ee7669e6c2215772430387076b12650
 SHA512:
-  metadata.gz: bd0fd64f099a8a15adb96f3d7d0be5952e4a371f33beddab08427491b818fdcfd12484c376fceb8f0b468ed88423cd47f95c39f8bd9d45e14d2f51c98071b7fa
-  data.tar.gz: 5a69fcb0b32b336e92cfe714c4641e1f38b7a549080e11e20c27031320a9a661d02c06fb7567831f04e105c0f7b9f3c1f4ee003342d67b0a05e4348317feffd9
+  metadata.gz: cadde1ce5c1f15a34d597cdf4ad85d6c5db65f4cd4e4e91cb121d38d91a6c4a2acd445489619d0525e50d919c514127a8f222cdc26c11d997b971d18f25b847b
+  data.tar.gz: e79c2db21ecb241094104e5624c0d5816e2d4ddaab9009b2071678b3dfac5b47a99694b1d466bc83a883d3b96f88bff85bc5d8fefbbe8c5e90ef8bbae4e14e57

data/app/controllers/admin/organizations_controller.rb

@@ -6,7 +6,7 @@ module Admin
     include Effective::CrudController
 
     resource_scope -> { EffectiveOrganizations.Organization.deep.all }
-    datatable -> { Admin::EffectiveOrganizationsDatatable.new }
+    datatable -> { EffectiveResources.best('Admin::EffectiveOrganizationsDatatable').new }
 
     private
 

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,6 +32,8 @@ module EffectiveOrganizationsOrganization
 
     effective_resource do
       title                 :string
+      email                 :string
+
       category              :string
 
       notes                 :text

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/app/views/effective/organizations/_dashboard.html.haml

@@ -1,10 +1,10 @@
 %h2 Organizations
 
 - if current_user.organizations.present?
-  %p You belong to #{pluralize(current_user.organizations.length, 'organization')}
+  %p You are a representative for #{pluralize(current_user.organizations.length, 'organization')}.
 
   - datatable = EffectiveResources.best('EffectiveOrganizationsDatatable').new(self, namespace: :effective)
-  = render_datatable(datatable)
+  = render_datatable(datatable, simple: true)
 
 - else
-  %p You do not belong to any organizations.
+  %p You are not a representative. When you create an organization, or if someone else adds you to their organization, we'll show them here.

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

@@ -5,9 +5,11 @@ class CreateEffectiveOrganizations < ActiveRecord::Migration[6.0]
       t.string    :title
 
       t.string    :category
+      t.string    :email
       t.text      :notes
 
-      t.integer :representatives_count, default: 0
+      t.integer   :roles_mask
+      t.integer   :representatives_count, default: 0
 
       t.datetime :updated_at
       t.datetime :created_at
@@ -18,6 +20,7 @@ class CreateEffectiveOrganizations < ActiveRecord::Migration[6.0]
     # Representatives
     create_table :representatives do |t|
       t.integer :organization_id
+      t.string :organization_type
 
       t.integer :user_id
       t.string :user_type
@@ -28,7 +31,7 @@ class CreateEffectiveOrganizations < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    add_index :representatives, [:organization_id]
+    add_index :representatives, [:organization_id, :organization_type]
     add_index :representatives, [:user_id, :user_type]
 
   end

data/lib/effective_organizations/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrganizations
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_organizations
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails