Pārlūkot izejas kodu

#62 - 'Show events' setting and Reverse checkbox list.

AntonLV 12 gadi atpakaļ
vecāks
revīzija
4a4f052416

+ 4 - 4
modules/boonex/notifications/classes/BxNtfsDb.php

@@ -39,15 +39,15 @@ class BxNtfsDb extends BxBaseModNotificationsDb
 
 		//--- Apply modules or handlers filter
 		$sWhereModuleFilter = '';
-		if(isset($aParams['modules']) && !empty($aParams['modules']) && is_array($aParams['modules']))
-			$sWhereModuleFilter = "AND `type` IN (" . $this->implode_escape($aParams['modules']) . ") ";
+		if(!empty($aParams['modules']) && is_array($aParams['modules']))
+			$sWhereModuleFilter = "AND `" . $this->_sTable . "`.`type` IN (" . $this->implode_escape($aParams['modules']) . ") ";
 
 		if($sWhereModuleFilter == '') {
 			$aHidden = $this->_oConfig->getHandlersHidden();
-			$sWhereModuleFilter = is_array($aHidden) && !empty($aHidden) ? "AND `th`.`id` NOT IN (" . $this->implode_escape($aHidden) . ") " : "";
+			$sWhereModuleFilter = !empty($aHidden) && is_array($aHidden) ? "AND `" . $this->_sTableHandlers . "`.`id` NOT IN (" . $this->implode_escape($aHidden) . ") " : "";
 		}
 
-		if($sWhereModuleFilter == '')
+		if($sWhereModuleFilter != '')
 			$sWhereClause .= $sWhereModuleFilter;
 
 		//--- Check flag 'New'

+ 1 - 1
modules/boonex/notifications/install/langs/en.xml

@@ -10,7 +10,7 @@
     <string name="_bx_ntfs_menu_item_title_notifications"><![CDATA[Notifications]]></string>
 
 	<string name="_bx_ntfs_option_events_per_page"><![CDATA[Number of events are displayed on View page]]></string>
-	<string name="_bx_ntfs_option_events_hide"><![CDATA[Hide events from Notifications]]></string>
+	<string name="_bx_ntfs_option_events_hide"><![CDATA[Show events in Notifications]]></string>
 
 	<string name="_bx_ntfs_alert_action_added"><![CDATA[add]]></string>
 

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

@@ -27,7 +27,7 @@ SET @iCategId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `check`, `check_params`, `check_error`, `extra`, `order`) VALUES
 ('bx_notifications_events_per_page', '10', @iCategId, '_bx_ntfs_option_events_per_page', 'digit', '', '', '', '', 1),
-('bx_notifications_events_hide', '', @iCategId, '_bx_ntfs_option_events_hide', 'list', '', '', '', 'a:2:{s:6:"module";s:16:"bx_notifications";s:6:"method";s:21:"get_actions_checklist";}', 2);
+('bx_notifications_events_hide', '', @iCategId, '_bx_ntfs_option_events_hide', 'rlist', '', '', '', 'a:2:{s:6:"module";s:16:"bx_notifications";s:6:"method";s:21:"get_actions_checklist";}', 2);
 
 
 -- ALERTS