From 2459df569e03a3763c20af1df8197ce9415c3767 Mon Sep 17 00:00:00 2001 From: Finley Ghosh Date: Sun, 7 Dec 2025 21:18:35 +1100 Subject: [PATCH] Fixing bug where quote revisions would not set the user, fixing quotes not showing up if they don't have a valid user --- go/internal/cmc/handlers/quotes/quotes.go | 6 +++--- php/app/controllers/documents_controller.php | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go/internal/cmc/handlers/quotes/quotes.go b/go/internal/cmc/handlers/quotes/quotes.go index 5b8b2f3c..07e1114e 100644 --- a/go/internal/cmc/handlers/quotes/quotes.go +++ b/go/internal/cmc/handlers/quotes/quotes.go @@ -91,7 +91,7 @@ func (q ExpiringSoonQuoteRowWrapper) GetUsername() string { if q.Username.Valid { return q.Username.String } - return "Unknown" + return "-" } func (q ExpiringSoonQuoteRowWrapper) GetUserEmail() string { if q.UserEmail.Valid { @@ -115,7 +115,7 @@ func (q RecentlyExpiredQuoteRowWrapper) GetUsername() string { if q.Username.Valid { return q.Username.String } - return "Unknown" + return "-" } func (q RecentlyExpiredQuoteRowWrapper) GetUserEmail() string { if q.UserEmail.Valid { @@ -141,7 +141,7 @@ func (q ExpiringSoonQuoteOnDayRowWrapper) GetUsername() string { if q.Username.Valid { return q.Username.String } - return "Unknown" + return "-" } func (q ExpiringSoonQuoteOnDayRowWrapper) GetUserEmail() string { if q.UserEmail.Valid { diff --git a/php/app/controllers/documents_controller.php b/php/app/controllers/documents_controller.php index 951d1e01..ca5115da 100755 --- a/php/app/controllers/documents_controller.php +++ b/php/app/controllers/documents_controller.php @@ -540,6 +540,10 @@ ENDINSTRUCTIONS; $number_of_revisions = $this->Document->Quote->findCount('Quote.enquiry_id ='. $enquiryid); $newDoc['Document']['revision'] = $number_of_revisions; $newDoc['Document']['type'] = 'quote'; + + // user_id for the new revision will be the current user + $currentUser = $this->GetCurrentUser(); + $newDoc['Document']['user_id'] = $currentUser['User']['id']; $newDoc['DocPage'] = $document['DocPage'];