[IssueTracker] Tracks "Others Watching" in issue history (#8875)

Resolves #8874
aces · Sep 5, 2023 · c7c0141 · c7c0141
1 parent 0ae7a24
commit c7c0141
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/SQL/0000-00-00-schema.sql b/SQL/0000-00-00-schema.sql
@@ -1531,7 +1531,7 @@ CREATE TABLE `issues_history` (
   `issueHistoryID` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `newValue` longtext NOT NULL,
   `dateAdded` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `fieldChanged` enum('assignee','status','comment','sessionID','centerID','title','category','module','lastUpdatedBy','priority','candID') NOT NULL DEFAULT 'comment',
+  `fieldChanged` enum('assignee','status','comment','sessionID','centerID','title','category','module','lastUpdatedBy','priority','candID','watching') NOT NULL DEFAULT 'comment',
   `issueID` int(11) unsigned NOT NULL,
   `addedBy` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`issueHistoryID`),

diff --git a/modules/issue_tracker/php/edit.class.inc b/modules/issue_tracker/php/edit.class.inc
@@ -478,7 +478,16 @@ class Edit extends \NDB_Page implements ETagCalculator
         }
 
         // Get changed values to save in history
-        $historyValues = $this->getChangedValues($issueValues, $issueID, $user);
+        $issueValuesWithWatching = $issueValues;
+        if (isset($values['othersWatching'])) {
+            $usersWatching = $values['othersWatching'];
+            $issueValuesWithWatching['watching'] = $usersWatching;
+        }
+        $historyValues = $this->getChangedValues(
+            $issueValuesWithWatching,
+            $issueID,
+            $user
+        );
 
         if (!empty($issueID)) {
             $db->update('issues', $issueValues, ['issueID' => $issueID]);