effective_organizations 0.0.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71f3a2d048f4c02e6388c77579b8c0ba2f348eb08574fcb9137759dceb0b5caa
-  data.tar.gz: c5fe4918cf3116a728c6d0bb6ae0acd4146f4ebd2148b9012dc905041a70523e
+  metadata.gz: 3d52be5a66c34f0aa18c767a06ed30d2cd231b43ab13e1366cc7ef2a3531ef89
+  data.tar.gz: ba7b2680295717d510f5cc086c0588cb6048eab03afdc3d495974dbd4d8d57e8
 SHA512:
-  metadata.gz: 92bac27ea6827e568a9ec4ca409feb38e8b162e4b213ea63c7451570be3bc51aa03ee6fd89a6c4ef85da4307e74f19b1157ceafbaa87a9ca1bb25d8f94ba1f4c
-  data.tar.gz: 1a1fd5f3e02af92f13f4c303c12e11e08226e7dfb4f4e244d22b6785f8409493254cbe2b7d5c96000d5c9bb1705215e10b9cd1914828ceecf63d5acb2c336d8c
+  metadata.gz: eabee3b007990c185848082fe175b205ae8b666a9f5b183e377aead04285146e0efcbf4b7c9848cbd6b9f9ccca5aa26dbd6f9d4ce3902841c5add09d76df1a19
+  data.tar.gz: 5cc20f6f1370f40cd0c00c990df1c40deec55434b54726a780a7536a92b3c4116df8e59ad2818772b5f5d7108bb8ddb4aafb70cc1d3b8dcf24753e953b439763

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,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

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, 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/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

@@ -5,9 +5,13 @@ 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.boolean   :archived, default: false
+
+      t.integer   :representatives_count, default: 0
 
       t.datetime :updated_at
       t.datetime :created_at
@@ -18,6 +22,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 +33,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.8'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

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