LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

feat: Vite + vue 3 💚 (#10047)

Browse Source 
Fixes https://github.com/chatwoot/chatwoot/issues/8436
Fixes https://github.com/chatwoot/chatwoot/issues/9767
Fixes https://github.com/chatwoot/chatwoot/issues/10156
Fixes https://github.com/chatwoot/chatwoot/issues/6031
Fixes https://github.com/chatwoot/chatwoot/issues/5696
Fixes https://github.com/chatwoot/chatwoot/issues/9250
Fixes https://github.com/chatwoot/chatwoot/issues/9762

---------

Co-authored-by: Pranav <pranavrajs@gmail.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
This commit is contained in:
Shivam Mishra
2024-10-02 13:06:30 +05:30
committed by GitHub
parent e0bf2bd9d4
commit 42f6621afb
661 changed files with 15939 additions and 31194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/macro.rb
View File

@@ -40,7 +40,7 @@ class Macro < ApplicationRecord
def self.with_visibility(user, _params)
records = Current.account.macros.global
records = records.or(personal.where(created_by_id: user.id))
records = records.or(personal.where(created_by_id: user.id, account_id: Current.account.id))
records.order(:id)
end