Merge remote-tracking branch 'origin/hotfix-19.1' into develop

Author: nairdo

Rock.Tests/Cms/ThemeOverrideBuilderTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -415,12 +416,9 @@ public void Build_WithAllOptions_EmitsInCorrectOrder()
         {
             using ( TestHelper.CreateScopedRockApp() )
             {
-                var tablerPath = RockApp.Current.MapPath( "~/Styles/styles-v2/icons/tabler-icon.css" );
-                var tablerHash = System.IO.File.ReadAllText( tablerPath ).XxHash();
-
                 var expectedContent = $@"{ThemeOverrideBuilder.TopOverrideStartMarker}
 @import url('on.css');
-@import url('/Styles/styles-v2/icons/tabler-icon.css?v={tablerHash}');
+@import url('/Styles/styles-v2/icons/tabler-icon.css');
 {ThemeOverrideBuilder.TopOverrideEndMarker}
 
 
@@ -449,6 +447,12 @@ public void Build_WithAllOptions_EmitsInCorrectOrder()
 
                 var content = builder.Build( string.Empty ).Trim();
 
+                // The builder adds a version hash to the tabler icons import,
+                // but only if the file exists. Depending on the state of the
+                // cloned repository, it may or may not exist. If it does, just
+                // strip it out.
+                content = Regex.Replace( content, @"tabler-icon\.css\?v=[^']+", "tabler-icon.css" );
+
                 Assert.AreEqual( expectedContent, content );
             }
         }

Rock/Model/Workflow/Workflow/Workflow.Logic.cs

@@ -275,7 +275,7 @@ public bool HasActiveEntryForm( Person person )
                             ( canEdit ) ||
                             ( !a.AssignedGroupId.HasValue && !a.AssignedPersonAliasId.HasValue ) ||
                             ( a.AssignedPersonAlias != null && a.AssignedPersonAlias.PersonId == personId ) ||
-                            ( a.AssignedGroup != null && a.AssignedGroup.Members.Any( m => m.PersonId == personId ) )
+                            ( a.AssignedGroup != null && a.AssignedGroup.Members.Any( m => m.PersonId == personId && m.GroupMemberStatus != GroupMemberStatus.Inactive ) )
                         )
                     )
                     .ToList()
@@ -325,7 +325,7 @@ internal WorkflowAction GetNextInteractiveAction( Person person, int? actionId,
                         skipAuthorization
                         || ( !a.AssignedGroupId.HasValue && !a.AssignedPersonAliasId.HasValue )
                         || ( a.AssignedPersonAlias != null && a.AssignedPersonAlias.PersonId == personId )
-                        || ( a.AssignedGroup != null && a.AssignedGroup.Members.Any( m => m.PersonId == personId ) )
+                        || ( a.AssignedGroup != null && a.AssignedGroup.Members.Any( m => m.PersonId == personId && m.GroupMemberStatus != GroupMemberStatus.Inactive ) )
                     )
                 )
                 .OrderBy( a => a.ActivityTypeCache.Order )

Rock/Model/Workflow/WorkflowAction/WorkflowActionService.cs

@@ -63,7 +63,7 @@ public List<WorkflowAction> GetActiveForms( Person person )
                 .Where( a => a.ActivatedDateTime.HasValue && !a.CompletedDateTime.HasValue )
                 .Where( a =>
                  ( a.AssignedPersonAliasId.HasValue && personAliasIds.Contains( a.AssignedPersonAliasId.Value ) ) ||
-                         ( a.AssignedGroupId.HasValue && a.AssignedGroup.Members.Any( m => m.PersonId == person.Id ) ) ).Select( a => a.Id ).ToList();
+                         ( a.AssignedGroupId.HasValue && a.AssignedGroup.Members.Any( m => m.PersonId == person.Id && m.GroupMemberStatus != GroupMemberStatus.Inactive ) ) ).Select( a => a.Id ).ToList();
 
             // Get all of the active form actions with an activity that assigned to the specified person
             var formActionsQry = GetActiveForms().Where( a => assignedActiveActivityIdList.Contains( a.ActivityId ) );

RockWeb/Blocks/Fundraising/FundraisingLeaderToolbox.ascx.cs

@@ -170,7 +170,9 @@ protected void BindGroupMembersGrid()
             var rockContext = new RockContext();
 
             int groupId = hfGroupId.Value.AsInteger();
-            var groupMembersQuery = new GroupMemberService( rockContext ).Queryable().Where( a => a.GroupId == groupId );
+            var groupMembersQuery = new GroupMemberService( rockContext )
+                .Queryable()
+                .Where( a => a.GroupId == groupId && a.GroupMemberStatus == GroupMemberStatus.Active );
             var group = new GroupService( rockContext ).Get( groupId );
             group.LoadAttributes( rockContext );
             var defaultIndividualFundRaisingGoal = group.GetAttributeValue( "IndividualFundraisingGoal" ).AsDecimalOrNull();

RockWeb/Blocks/WorkFlow/MyWorkflows.ascx.cs

@@ -347,7 +347,7 @@ private void GetData()
                         authorizedActivityTypes.Contains( a.ActionType.ActivityTypeId ) &&
                         (
                             ( a.Activity.AssignedPersonAlias != null && a.Activity.AssignedPersonAlias.PersonId == personId ) ||
-                            ( a.Activity.AssignedGroup != null && a.Activity.AssignedGroup.Members.Any( m => m.PersonId == personId ) )
+                            ( a.Activity.AssignedGroup != null && a.Activity.AssignedGroup.Members.Any( m => m.PersonId == personId && m.GroupMemberStatus != GroupMemberStatus.Inactive ) )
                         )
                     )
                     .ToList();

RockWeb/Blocks/WorkFlow/WorkflowEntry.ascx.cs

@@ -694,7 +694,7 @@ private bool HydrateObjects()
                     /* if user isn't authorized to edit, limit to ones that are any of the following conditions
                     // - Not assigned
                     // - Assigned to current person
-                    // - Assigned to a group that the current user is a member of
+                    // - Assigned to a group that the current user is member (non-inactive) of
                     */
 
                     activeWorkflowActivitiesList = activeWorkflowActivitiesList.Where( a =>
@@ -711,7 +711,7 @@ private bool HydrateObjects()
                             return true;
                         }
 
-                        if ( a.AssignedGroup != null && a.AssignedGroup.Members.Any( m => m.PersonId == personId ) )
+                        if ( a.AssignedGroup != null && a.AssignedGroup.Members.Any( m => m.PersonId == personId && m.GroupMemberStatus != GroupMemberStatus.Inactive ) )
                         {
                             // Assigned to a group that the current user is a member of
                             return true;