From bef07449726ba2b4e81a78656f1d6ecf9c20509d Mon Sep 17 00:00:00 2001 From: John Date: Tue, 10 Jan 2017 16:04:18 +0000 Subject: [PATCH] B2016-274 - allow user with Admin rights who also is included in the reviewer group edit existing annotations made by other users --- PROMS/Volian.Controls.Library/AnnotationDetails.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs index 0a1b3d13..34aa8dcb 100644 --- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs @@ -355,7 +355,9 @@ namespace Volian.Controls.Library rtxbComment.Visible = true; if (!_LoadingGrid) rtxbComment.Focus(); // Set the focus to the comment text - if (CurrentAnnotation != null && MyUserInfo.IsReviewer(CurrentAnnotation.MyItem.MyDocVersion ) && CurrentAnnotation.UserID != MyUserInfo.UserID) + + // Bug Fix: B2016-274 if admin user also has reviewer set, allow admin user to modify existing annotations + if (CurrentAnnotation != null && (!(MyUserInfo.IsAdministrator() || MyUserInfo.IsSetAdministrator(CurrentAnnotation.MyItem.MyDocVersion)) && (MyUserInfo.IsReviewer(CurrentAnnotation.MyItem.MyDocVersion ) && CurrentAnnotation.UserID != MyUserInfo.UserID))) { btnRemoveAnnotation.Enabled = false; cbGridAnnoType.Enabled = false;