Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Wiki Activity

B2016-274 - allow user with Admin rights who also is included in the reviewer group edit existing annotations made by other users

Browse Source
This commit is contained in:
John Jenko 2017-01-10 16:04:18 +00:00
parent bfc321abbf
commit bef0744972
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/Volian.Controls.Library/AnnotationDetails.cs
View File

@ -355,7 +355,9 @@ namespace Volian.Controls.Library
rtxbComment.Visible = true; rtxbComment.Visible = true;
if (!_LoadingGrid) if (!_LoadingGrid)
rtxbComment.Focus(); // Set the focus to the comment text 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; btnRemoveAnnotation.Enabled = false;
cbGridAnnoType.Enabled = false; cbGridAnnoType.Enabled = false;