supplier client sections working with problematic authentication still active

This commit is contained in:
2020-02-27 15:44:43 -05:00
parent 9e86b18c3e
commit 2149345d3d
33 changed files with 456 additions and 281 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ class Employee
DEFAULT_SETTINGS.each do |attribute, default_value|
define_method(attribute) { settings.public_send attribute }
define_method("#{attribute}=") do |value|
is_dirty
#is_dirty
settings.set attribute, value
end
if default_value == true or default_value == false # boolean
+3 -3
View File
@@ -17,8 +17,8 @@ class List
#unless join_request_user_ids.include?(requester.id) or user_ids.include?(requester.id) # do not resend
unless user_ids.include?(requester.id) # resend for the sake of it for now
@join_requests = nil # bust cache
self.join_request_user_ids_will_change!
self.join_request_user_ids |= [requester.id]
self.is_dirty
if save
broadcast_users 'user_join_request', payload: Users::JoinRequestSerializer.serialize(join_request_for_user(requester), include: %w[list user])
end
@@ -31,7 +31,7 @@ class List
user.active_list_id = self.id
add_user(user)
user.save
self.is_dirty
join_request_user_ids_will_change!
save and broadcast_users 'join_request_approved', id: "jr-#{user.id}"
end
end
@@ -39,8 +39,8 @@ class List
def reject_join_request_for_user!(user_id)
user_id = user_id.id if user_id.is_a?(User) # allow model to be passed as argument
if join_request_user_ids.include?(user_id)
join_request_user_ids_will_change!
join_request_user_ids.delete(user_id)
self.is_dirty
if save
# user_id is not part of the list, so should be broadcasted separately
broadcast_user user_id, 'join_request_rejected', id: "jr-#{user_id}"
+1
View File
@@ -13,6 +13,7 @@ class SectionArea
view :by_supplier_id, key: :supplier_id
view :by_section_id, key: :section_id
view :by_supplier_id_and_id, key: [:supplier_id, :_id]
def self.for_supplier(supplier)
find_all_by_supplier_id(supplier.id)
+1
View File
@@ -11,6 +11,7 @@ class SectionElement
view :by_supplier_id, key: :supplier_id
view :by_section_id, key: :section_id
view :by_supplier_id_and_id, key: [:supplier_id, :_id]
def self.for_supplier(supplier)
find_all_by_supplier_id(supplier.id)
+10
View File
@@ -2,6 +2,16 @@ class Supplier
include SimplyStored::Couch
include ActiveModel::SerializerSupport
include Supplier::Counters
PRELOAD_INCLUDES = %w[
sections
sections.tables
sections.section_areas
sections.section_elements
product_categories
product_categories.products
product_categories.products.product_variants
]
#devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable, :confirmable