Ticket #471: Accounts module.

modules/boonex/accounts/classes/BxAccntGridAdministration.php

@@ -116,6 +116,9 @@ class BxAccntGridAdministration extends BxBaseModProfileGridAdministration
     {
     	$iAction = BX_PROFILE_ACTION_MANUAL;
     	$oProfile = BxDolProfile::getInstanceAccountProfile($mixedId);
+    	if(!$oProfile)
+    	    return false;
+
     	return $isChecked ? $oProfile->activate($iAction) : $oProfile->suspend($iAction);
     }
 

modules/boonex/accounts/install/sql/enable.sql

@@ -17,11 +17,11 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 ('bx_accounts_menu_manage_tools', @sName, '_bx_accnt_menu_set_title_manage_tools', 0);
 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('bx_accounts_menu_manage_tools', @sName, 'resend-cemail', '_bx_accnt_menu_item_title_system_resend_cemail', '_bx_accnt_menu_item_title_resend_cemail', 'javascript:void(0)', 'javascript:{js_object}.onClickResendCemail({content_id});', '_self', 'envelope-o', '', 192, 1, 0, 1),
-('bx_accounts_menu_manage_tools', @sName, 'delete', '_bx_accnt_menu_item_title_system_delete', '_bx_accnt_menu_item_title_delete', 'javascript:void(0)', 'javascript:{js_object}.onClickDelete({content_id});', '_self', 'trash-o', '', 192, 1, 0, 2),
-('bx_accounts_menu_manage_tools', @sName, 'delete-with-content', '_bx_accnt_menu_item_title_system_delete_with_content', '_bx_accnt_menu_item_title_delete_with_content', 'javascript:void(0)', 'javascript:{js_object}.onClickDeleteWithContent({content_id});', '_self', 'trash-o', '', 192, 1, 0, 3),
-('bx_accounts_menu_manage_tools', @sName, 'make-operator', '_bx_accnt_menu_item_title_system_make_operator', '_bx_accnt_menu_item_title_make_operator', 'javascript:void(0)', 'javascript:{js_object}.onClickMakeOperator({content_id});', '_self', 'wrench', '', 192, 1, 0, 4),
-('bx_accounts_menu_manage_tools', @sName, 'unmake-operator', '_bx_accnt_menu_item_title_system_unmake_operator', '_bx_accnt_menu_item_title_unmake_operator', 'javascript:void(0)', 'javascript:{js_object}.onClickUnmakeOperator({content_id});', '_self', 'wrench', '', 192, 1, 0, 5);
+('bx_accounts_menu_manage_tools', @sName, 'resend-cemail', '_bx_accnt_menu_item_title_system_resend_cemail', '_bx_accnt_menu_item_title_resend_cemail', 'javascript:void(0)', 'javascript:{js_object}.onClickResendCemail({content_id}, this);', '_self', 'envelope-o', '', 192, 1, 0, 1),
+('bx_accounts_menu_manage_tools', @sName, 'delete', '_bx_accnt_menu_item_title_system_delete', '_bx_accnt_menu_item_title_delete', 'javascript:void(0)', 'javascript:{js_object}.onClickDelete({content_id}, this);', '_self', 'trash-o', '', 192, 1, 0, 2),
+('bx_accounts_menu_manage_tools', @sName, 'delete-with-content', '_bx_accnt_menu_item_title_system_delete_with_content', '_bx_accnt_menu_item_title_delete_with_content', 'javascript:void(0)', 'javascript:{js_object}.onClickDeleteWithContent({content_id}, this);', '_self', 'trash-o', '', 192, 1, 0, 3),
+('bx_accounts_menu_manage_tools', @sName, 'make-operator', '_bx_accnt_menu_item_title_system_make_operator', '_bx_accnt_menu_item_title_make_operator', 'javascript:void(0)', 'javascript:{js_object}.onClickMakeOperator({content_id}, this);', '_self', 'wrench', '', 192, 1, 0, 4),
+('bx_accounts_menu_manage_tools', @sName, 'unmake-operator', '_bx_accnt_menu_item_title_system_unmake_operator', '_bx_accnt_menu_item_title_unmake_operator', 'javascript:void(0)', 'javascript:{js_object}.onClickUnmakeOperator({content_id}, this);', '_self', 'wrench', '', 192, 1, 0, 5);
 
 -- MENU: dashboard manage tools
 SET @iManageMenuOrder = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_menu_items` WHERE `set_name`='sys_account_dashboard_manage_tools' LIMIT 1);

modules/boonex/accounts/js/manage_tools.js

@@ -42,42 +42,52 @@ BxAccntManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
 	});
 };
 
-BxAccntManageTools.prototype.onClickResendCemail = function(iContentId) {
+BxAccntManageTools.prototype.onClickResendCemail = function(iContentId, oLink) {
 	$('.bx-popup-applied:visible').dolPopupHide();
 
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'resend_cemail', {}, '', false, 0);
+	var oGrid = glGrids[this._sObjNameGrid];
+	var oData = oGrid._checkAppend(oLink, oGrid._getActionDataForReload());
+	oGrid.actionWithId(iContentId, 'resend_cemail', oData, '', false, 0);
 };
 
-BxAccntManageTools.prototype.onClickDelete = function(iContentId) {
+BxAccntManageTools.prototype.onClickDelete = function(iContentId, oLink) {
 	$('.bx-popup-applied:visible').dolPopupHide();
 
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
+	var oGrid = glGrids[this._sObjNameGrid];
+	var oData = oGrid._checkAppend(oLink, {});
+	oGrid.actionWithId(iContentId, 'delete', oData, '', false, 1);
 };
 
-BxAccntManageTools.prototype.onClickDeleteWithContent = function(iContentId) {
+BxAccntManageTools.prototype.onClickDeleteWithContent = function(iContentId, oLink) {
 	$('.bx-popup-applied:visible').dolPopupHide();
 
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete_with_content', {}, '', false, 1);
+	var oGrid = glGrids[this._sObjNameGrid];
+	var oData = oGrid._checkAppend(oLink, {});
+	oGrid.actionWithId(iContentId, 'delete_with_content', oData, '', false, 1);
 };
 
-BxAccntManageTools.prototype.onClickMakeOperator = function(iContentId) {
+BxAccntManageTools.prototype.onClickMakeOperator = function(iContentId, oLink) {
 	$('.bx-popup-applied:visible').dolPopupHide({
 		onHide: function(oPopup) {
 			$(oPopup).remove();
 		} 
 	});
 
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'make_operator', {}, '', false, 0);
+	var oGrid = glGrids[this._sObjNameGrid];
+	var oData = oGrid._checkAppend(oLink, oGrid._getActionDataForReload());
+    oGrid.actionWithId(iContentId, 'make_operator', oData, '', false, 0);
 };
 
-BxAccntManageTools.prototype.onClickUnmakeOperator = function(iContentId) {
+BxAccntManageTools.prototype.onClickUnmakeOperator = function(iContentId, oLink) {
 	$('.bx-popup-applied:visible').dolPopupHide({
 		onHide: function(oPopup) {
 			$(oPopup).remove();
 		} 
 	});
 
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'unmake_operator', {}, '', false, 0);
+	var oGrid = glGrids[this._sObjNameGrid];
+	var oData = oGrid._checkAppend(oLink, oGrid._getActionDataForReload());
+	oGrid.actionWithId(iContentId, 'unmake_operator', oData, '', false, 0);
 };
 
 /** @} */