Просмотр исходного кода

Ticket #5653 - Notifications: Improve grouping for notifications with the same source.

AntonLV 1 месяц назад
Родитель
Сommit
48248a7045

+ 1 - 1
modules/boonex/notifications/classes/BxNtfsTemplate.php

@@ -264,7 +264,7 @@ class BxNtfsTemplate extends BxBaseModNotificationsTemplate
         if($bEventCanceled)
             return '';
 
-        if(($sGroupedByMac = $aEvent['grouped_by_mac'] ?? false)) {
+        if(($sGroupedByMac = $aEvent['grouped_by_mac'] ?? false) && strpos($sGroupedByMac, ',') !== false) {
             $aGroupedByMac = explode(',', $sGroupedByMac);
 
             $sContentParsed = '';

+ 1 - 1
modules/boonex/notifications/install/sql/enable.sql

@@ -110,7 +110,7 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `info`, `t
 ('bx_notifications_summary_chars', '200', @iCategId, '_bx_ntfs_option_summary_chars', '', 'digit', '', '', '', '', 50),
 ('bx_notifications_owner_name_chars', '21', @iCategId, '_bx_ntfs_option_owner_name_chars', '', 'digit', '', '', '', '', 51),
 ('bx_notifications_content_chars', '32', @iCategId, '_bx_ntfs_option_content_chars', '', 'digit', '', '', '', '', 52),
-('bx_notifications_email_subject_chars', '30', @iCategId, '_bx_ntfs_option_email_subject_chars', '', 'digit', '', '', '', '', 53),
+('bx_notifications_email_subject_chars', '90', @iCategId, '_bx_ntfs_option_email_subject_chars', '', 'digit', '', '', '', '', 53),
 ('bx_notifications_push_message_chars', '190', @iCategId, '_bx_ntfs_option_push_message_chars', '', 'digit', '', '', '', '', 54);