Skip to content

Commit 8dffa3c

Browse files
cabal95cabal95
committed
+ (Workflow) Added preview version of new Obsidian Workflow Entry block that can be added to new pages for testing.
1 parent e94987e commit 8dffa3c

99 files changed

Lines changed: 10242 additions & 1366 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Rock.Blocks/Event/RegistrationEntry.cs‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
using Rock.ClientService.Finance.FinancialPersonSavedAccount.Options;
3333
using Rock.Data;
3434
using Rock.ElectronicSignature;
35+
using Rock.Field;
3536
using Rock.Financial;
3637
using Rock.Model;
3738
using Rock.Pdf;
@@ -3776,34 +3777,16 @@ RegistrationGuid argument.
37763777
return null;
37773778
}
37783779

3779-
var filterValues = new List<string>();
37803780
var fieldAttribute = AttributeCache.Get( comparedToField.AttributeId.Value );
3781-
var fieldType = fieldAttribute?.FieldType?.Field;
3782-
3783-
if ( fieldType == null )
3784-
{
3785-
return null;
3786-
}
3787-
3788-
var comparisonTypeValue = vr.ComparisonType.ConvertToString( false );
3789-
if ( comparisonTypeValue != null )
3790-
{
3791-
// only add the comparisonTypeValue if it is specified, just like
3792-
// the logic at https://github.com/SparkDevNetwork/Rock/blob/22f64416b2461c8a988faf4b6e556bc3dcb209d3/Rock/Field/FieldType.cs#L558
3793-
filterValues.Add( comparisonTypeValue );
3794-
}
3795-
3796-
filterValues.Add( vr.ComparedToValue );
3797-
3798-
var comparisonValue = fieldType.GetPublicFilterValue( filterValues.ToJson(), fieldAttribute.ConfigurationValues );
3781+
var ruleBag = FieldVisibilityRule.GetPublicRuleBag( fieldAttribute, vr.ComparisonType, vr.ComparedToValue );
37993782

38003783
return new RegistrationEntryVisibilityBag
38013784
{
38023785
ComparedToRegistrationTemplateFormFieldGuid = vr.ComparedToFormFieldGuid.Value,
38033786
ComparisonValue = new PublicComparisonValueBag
38043787
{
3805-
ComparisonType = ( int? ) comparisonValue.ComparisonType,
3806-
Value = comparisonValue.Value
3788+
ComparisonType = ( int? ) ruleBag.ComparisonType,
3789+
Value = ruleBag.Value
38073790
}
38083791
};
38093792
} )

‎Rock.Blocks/Rock.Blocks.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
5151
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
5252
</Reference>
53+
<Reference Include="Rock.Common.Mobile">
54+
<HintPath>..\RockWeb\Bin\Rock.Common.Mobile.dll</HintPath>
55+
<Private>False</Private>
56+
</Reference>
5357
<Reference Include="System" />
5458
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
5559
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -395,6 +399,7 @@
395399
<Compile Include="WorkFlow\FormBuilder\FormBuilderDetail.cs" />
396400
<Compile Include="WorkFlow\FormBuilder\FormTemplateDetail.cs" />
397401
<Compile Include="WorkFlow\FormBuilder\Utility.cs" />
402+
<Compile Include="WorkFlow\WorkflowEntry.cs" />
398403
<Compile Include="WorkFlow\WorkflowTriggerDetail.cs" />
399404
<Compile Include="WorkFlow\WorkflowList.cs" />
400405
</ItemGroup>

0 commit comments

Comments
 (0)