Ticket #5186 - Tasks: Functionality improvements. Point 4.

modules/boonex/tasks/classes/BxTasksCmts.php

@@ -109,7 +109,7 @@ class BxTasksCmts extends BxTemplCmts
     {
         $aResult = parent::_prepareAlertParams($aCmt);
         if($this->_isAutoComment($aCmt) && isset($aResult['comment_text']))
-            $aResult['comment_text'] = $this->_getAutoCommentText($aTmplVarsText['text']);
+            $aResult['comment_text'] = $this->_getAutoCommentText($aResult['comment_text']);
 
         return $aResult;
     }

modules/boonex/tasks/classes/BxTasksModule.php

@@ -53,55 +53,12 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
         echo(json_encode($a));
     }
           
-    public function actionSetCompleted($iContentId, $iValue)
+    public function actionSetCompleted($iContentId, $iCompleted)
     {
-        if (!$this->isAllowManage($iContentId))
-            return;
-        
-        $CNF = &$this->_oConfig->CNF;
-
-        $this->_oDb->updateEntriesBy(array($CNF['FIELD_COMPLETED'] => $iValue), array($CNF['FIELD_ID'] => (int)$iContentId));
-
-        $sActionName = 'completed';
-        if($iValue == '0')
-            $sActionName = 'reopened';
+        if(!$this->isAllowManage($iContentId) || !$this->complete($iContentId, $iCompleted))
+            return echoJson(['code' => 1]);
 
-        $aContentInfo = $this->_oDb->getContentInfoById($iContentId);
-
-        $iContentAuthor = (int)$aContentInfo[$CNF['FIELD_AUTHOR']];
-        /**
-         * @hooks
-         * @hookdef hook-bx_tasks-completed 'bx_tasks', 'completed' - hook on task unassigned to profile
-         * - $unit_name - equals `bx_tasks`
-         * - $action - can be `completed` or `reopened`
-         * - $object_id - task id 
-         * - $sender_id - not used 
-         * - $extra_params - array of additional params with the following array keys:
-         *      - `object_author_id` - [int] profile_id for task's author
-         *      - `privacy_view` - [string] privacy view value
-         * @hook @ref hook-bx_tasks-completed
-         */
-        bx_alert($this->getName(), $sActionName, $iContentId, false, array(
-            'object_author_id' => $iContentAuthor,
-            'privacy_view' => $aContentInfo[$CNF['FIELD_ALLOW_VIEW_TO']]
-        ));
-
-        $oConnection = BxDolConnection::getObjectInstance($CNF['OBJECT_CONNECTION']);
-        if($oConnection) {
-            $aProfileIds = $oConnection->getConnectedContent($iContentId);
-            if(!empty($aProfileIds) && is_array($aProfileIds))
-                foreach($aProfileIds as $iProfileId) {
-                    if($iProfileId == $iContentAuthor)
-                        continue;
-
-                    bx_alert($this->getName(), $sActionName, $iContentId, false, array(
-                        'object_author_id' => $iProfileId,
-                        'privacy_view' => $aContentInfo[$CNF['FIELD_ALLOW_VIEW_TO']]
-                    ));
-                }
-        }
-
-        echo 'ok';
+        return echoJson(['code' => 0, 'reload' => 1]);
     }
 	
     public function actionSetFilterValue($iListId, $sValue)
@@ -762,6 +719,54 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
         return (bool)$aContentInfo[$CNF['FIELD_COMPLETED']];
     }
 
+    public function complete($iContentId, $iCompleted)
+    {
+        $CNF = &$this->_oConfig->CNF;
+
+        $iCompleted = (int)$iCompleted;
+        $this->_oDb->updateEntriesBy([$CNF['FIELD_COMPLETED'] => $iCompleted], [$CNF['FIELD_ID'] => (int)$iContentId]);
+
+        $sModule = $this->getName();
+        $sAction = !$iCompleted ? 'reopened' : 'completed';
+
+        $aContentInfo = $this->_oDb->getContentInfoById($iContentId);
+        $iContentAuthor = (int)$aContentInfo[$CNF['FIELD_AUTHOR']];
+        /**
+         * @hooks
+         * @hookdef hook-bx_tasks-completed 'bx_tasks', 'completed' - hook on task unassigned to profile
+         * - $unit_name - equals `bx_tasks`
+         * - $action - can be `completed` or `reopened`
+         * - $object_id - task id 
+         * - $sender_id - not used 
+         * - $extra_params - array of additional params with the following array keys:
+         *      - `object_author_id` - [int] profile_id for task's author
+         *      - `privacy_view` - [string] privacy view value
+         * @hook @ref hook-bx_tasks-completed
+         */
+        bx_alert($sModule, $sAction, $iContentId, false, array(
+            'object_author_id' => $iContentAuthor,
+            'privacy_view' => $aContentInfo[$CNF['FIELD_ALLOW_VIEW_TO']]
+        ));
+
+        if(($oConnection = BxDolConnection::getObjectInstance($CNF['OBJECT_CONNECTION'])) !== false) {
+            $aProfileIds = $oConnection->getConnectedContent($iContentId);
+            if(!empty($aProfileIds) && is_array($aProfileIds))
+                foreach($aProfileIds as $iProfileId) {
+                    if($iProfileId == $iContentAuthor)
+                        continue;
+
+                    bx_alert($sModule, $sAction, $iContentId, false, array(
+                        'object_author_id' => $iProfileId,
+                        'privacy_view' => $aContentInfo[$CNF['FIELD_ALLOW_VIEW_TO']]
+                    ));
+                }
+        }
+
+        $this->logActivity($iContentId, ['key' => '_bx_tasks_txt_msg_' . ($iCompleted ? '' : 'un') . 'completed']);
+
+        return true;
+    }
+
     public function logActivity($iContentId, $aMessage)
     {
         $CNF = &$this->_oConfig->CNF;
@@ -805,15 +810,8 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
         $this->logActivity($iContentId, ['key' => '_bx_tasks_txt_msg_edit_state', 'markers' => ['value' => $this->_oConfig->getStateTitle($iState)]]);
 
         $iCompleted = (int)$this->_oConfig->isCompleted($iState);
-        if($iCompleted != (int)$this->_oConfig->isCompleted($aContentInfo[$CNF['FIELD_STATE']])) {
-            $this->_oDb->updateEntriesBy([
-                $CNF['FIELD_COMPLETED'] => $iCompleted,
-            ], [
-                $CNF['FIELD_ID'] => $iContentId
-            ]);
-
-            $this->logActivity($iContentId, ['key' => '_bx_tasks_txt_msg_' . ($iCompleted ? '' : 'un') . 'completed']);
-        }
+        if($iCompleted != (int)$this->_oConfig->isCompleted($aContentInfo[$CNF['FIELD_STATE']]))
+            $this->complete($iContentId, $iCompleted);
     }
 }
 

modules/boonex/tasks/js/tasks.js

@@ -21,20 +21,24 @@ BxTasksView.prototype.init = function () {
 };
 
 BxTasksView.prototype.setCompleted = function (iId, oObj) {
-    var $this = this;
     var iVal = ($(oObj).prop('checked') ? 1 : 0);
-    $this._setCompleted(iId, iVal);
+
+    this._setCompleted(iId, iVal);
 };
 
 BxTasksView.prototype.setCompletedByMenu = function (iId, iValue, oObj) {
-    var $this = this;
     $(oObj).addClass('bx-btn-disabled');
-    $this._setCompleted(iId, iValue);
-    document.location.reload(true);
+
+    this._setCompleted(iId, iValue, function(oData) {
+        processJsonData(oData);
+    });
 };
 
-BxTasksView.prototype._setCompleted = function (iId, iValue) {
-    $.getJSON(this._oOptions.sActionUrl + 'set_completed/' + iId + '/' + iValue + '/', {}, function() {});
+BxTasksView.prototype._setCompleted = function (iId, iValue, onComplete) {
+    $.getJSON(this._oOptions.sActionUrl + 'set_completed/' + iId + '/' + iValue + '/', function(oData) {
+        if(typeof onComplete === 'function')
+            onComplete(oData);
+    });
 };
 	
 BxTasksView.prototype.processTaskList = function (iContextId, iId, obj) {