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

#3560 - Attendant app improvements - add alerts

RomanL 4 лет назад
Родитель
Сommit
88293ea0d6

+ 1 - 3
modules/boonex/attendant/classes/BxAttendantModule.php

@@ -19,7 +19,6 @@ class BxAttendantModule extends BxDolModule
         parent::__construct($aModule);
     }
 
-    
     public function actionRecomendedPopup($sModule, $sEvent, $iObjectId)
     {
         $sRv = '';
@@ -37,8 +36,7 @@ class BxAttendantModule extends BxDolModule
                 }
             }
         }
-        if ($aModuleData)
-            $sRv = $this->_oTemplate->popup($aModuleData);
+        $sRv = $this->_oTemplate->popup($aModuleData);
         
         bx_alert('bx_attendant', 'show_popup', bx_get_logged_profile_id(), 0, ['module' => $sModule, 'event' => $sEvent, 'object_id' => $iObjectId, 'result' => &$sRv]);
         

+ 1 - 2
modules/boonex/attendant/install/sql/enable.sql

@@ -27,8 +27,7 @@ INSERT INTO `sys_alerts_handlers` (`name`, `class`, `file`, `service_call`) VALU
 SET @iHandler := LAST_INSERT_ID();
 
 INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES
-('profile', 'add', @iHandler),
-('bx_spaces', 'fan_added', @iHandler);
+('profile', 'add', @iHandler);
 
 -- MENU: notifications
 SET @iMIOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name` = 'sys_account_notifications' AND `order` < 9999);

+ 2 - 2
modules/boonex/attendant/js/main.js

@@ -15,11 +15,11 @@ function BxAttendant(oOptions) {
     var $this = this;
 }
 
-BxAttendant.prototype.showPopup = function (sModule = '', sEvent = '', sObject = 0) {
+BxAttendant.prototype.showPopup = function (sModule = 'default', sEvent = 'default', sObject = 0) {
     var $this = this;
     
     $(window).dolPopupAjax({
-        url: $this._sActionsUri + '/RecomendedPopup/' + sModule + '/' + sEvent + '/' + sObject + '/',
+        url: $this._sActionsUri + 'RecomendedPopup/' + sModule + '/' + sEvent + '/' + sObject + '/',
         closeOnOuterClick: true,
 		removeOnClose: true,
         onLoad: function(sPopupSelector){