Merge branch 'production'
This commit is contained in:
@ -259,5 +259,5 @@ in schedule admin - if a publisher is always pair & family is not in the shift -
|
||||
[] revise import/export to word
|
||||
[] allow keyman/scheduler role
|
||||
[] allow blocking of inputs (different from publishing)
|
||||
|
||||
[] user - add createdAt field
|
||||
|
||||
|
@ -346,17 +346,17 @@ function PwaManager({ subs }) {
|
||||
>
|
||||
Спри известията на всички мои устройства {_subs != "" ? `(${_subs})` : ""}
|
||||
</button>
|
||||
<button
|
||||
onClick={sendTestNotification}
|
||||
disabled={!isSubscribed}
|
||||
className={`text-xs py-1 px-2 rounded-full focus:outline-none transition duration-150 ease-in-out ${!isSubscribed ? 'cursor-not-allowed bg-gray-300 text-gray-500' : 'bg-yellow-500 hover:bg-yellow-600 text-white'
|
||||
}`}
|
||||
>
|
||||
Тестово уведомление
|
||||
</button>
|
||||
</div>
|
||||
{isAdmin &&
|
||||
<div>
|
||||
<button
|
||||
onClick={sendTestNotification}
|
||||
disabled={!isSubscribed}
|
||||
className={`text-xs py-1 px-2 rounded-full focus:outline-none transition duration-150 ease-in-out ${!isSubscribed ? 'cursor-not-allowed bg-gray-300 text-gray-500' : 'bg-yellow-500 hover:bg-yellow-600 text-white'
|
||||
}`}
|
||||
>
|
||||
Send Test Notification
|
||||
</button>
|
||||
<button
|
||||
onClick={sendTestReminder}
|
||||
disabled={!isSubscribed}
|
||||
|
@ -152,7 +152,7 @@ export const sendPush = async (id, title, message, actions) => {
|
||||
where: { id }
|
||||
})
|
||||
|
||||
if (Array.isArray(publisher.pushSubscription) && publisher.pushSubscription.length) {
|
||||
if (publisher.pushSubscription && Array.isArray(publisher.pushSubscription) && publisher.pushSubscription.length) {
|
||||
for (const subscription of publisher.pushSubscription) {
|
||||
await webPush
|
||||
.sendNotification(
|
||||
|
Reference in New Issue
Block a user