Merge branch 'release-4.0.1' into develop

OnTopicCMS · Jan 8, 2020 · c7c9d33 · c7c9d33
2 parents 8e56be8 + a717517
commit c7c9d33
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/OnTopic.Data.Sql.Database/Stored Procedures/UpdateRelationships.sql b/OnTopic.Data.Sql.Database/Stored Procedures/UpdateRelationships.sql
@@ -22,9 +22,9 @@ INSERT
 INTO	@Existing_TopicIDs (
 	  TopicId
 	)
-SELECT	Target_TopicID
+SELECT	Target_TopicId
 FROM	Relationships
-WHERE	Source_TopicID		= @TopicID
+WHERE	Source_TopicId		= @TopicID
   AND	RelationshipKey		= @RelationshipKey
 
 --------------------------------------------------------------------------------------------------------------------------------
@@ -41,8 +41,8 @@ SELECT	@TopicId,
 	Target.TopicId
 FROM	@RelatedTopics		Target
 FULL JOIN	@Existing_TopicIDs	Existing
-  ON	Existing.TopicID	= Target.TopicID
-WHERE	Existing.TopicID	is null
+  ON	Existing.TopicId	= Target.TopicId
+WHERE	Existing.TopicId	is null
 
 --------------------------------------------------------------------------------------------------------------------------------
 -- RETURN TOPIC ID

diff --git a/OnTopic.Tests/ViewModels/DisableMappingTopicViewModel.cs b/OnTopic.Tests/ViewModels/DisableMappingTopicViewModel.cs
@@ -11,7 +11,7 @@ namespace OnTopic.Tests.ViewModels {
   | VIEW MODEL: DISABLE MAPPING
   \---------------------------------------------------------------------------------------------------------------------------*/
   /// <summary>
-  ///   Provides a simple view model with a single property (<see cref="Key") which is annotated with the <see
+  ///   Provides a simple view model with a single property (<see cref="Key" />) which is annotated with the <see
   ///   cref="DisableMappingAttribute"/>.
   /// </summary>
   /// <remarks>

diff --git a/OnTopic.Tests/ViewModels/Metadata/AttributeDescriptorTopicViewModel.cs b/OnTopic.Tests/ViewModels/Metadata/AttributeDescriptorTopicViewModel.cs
@@ -11,7 +11,7 @@ namespace OnTopic.Tests.ViewModels.Metadata {
   \---------------------------------------------------------------------------------------------------------------------------*/
   /// <summary>
   ///   Provides a strongly-typed data transfer object for testing view models with properties that map to custom collections
-  ///   on the source <see cref="Topic"/>, as part of <see cref="TopicMappingServiceTest.CustomCollection"/>.
+  ///   on the source <see cref="Topic"/>.
   /// </summary>
   /// <remarks>
   ///   This is a sample class intended for test purposes only; it is not designed for use in a production environment.

diff --git a/OnTopic.Tests/ViewModels/Metadata/TextAttributeTopicViewModel.cs b/OnTopic.Tests/ViewModels/Metadata/TextAttributeTopicViewModel.cs
@@ -3,15 +3,16 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
+using OnTopic.Metadata.AttributeTypes;
 
 namespace OnTopic.Tests.ViewModels.Metadata {
 
   /*============================================================================================================================
   | VIEW MODEL: TEXT ATTRIBUTE (DESCRIPTOR)
   \---------------------------------------------------------------------------------------------------------------------------*/
   /// <summary>
-  ///   Provides a strongly-typed data transfer object for testing view models with properties that map to custom collections
-  ///   on the source <see cref="Topic"/>, as part of <see cref="TopicMappingServiceTest.CustomCollection"/>.
+  ///   Provides a dummy implementation of a view model for an <see cref="AttributeTypeDescriptor"/> view model, in order to
+  ///   allow the dynamic resolution of mapping <see cref="TextAttribute"/> topics to view models.
   /// </summary>
   /// <remarks>
   ///   This is a sample class intended for test purposes only; it is not designed for use in a production environment.

diff --git a/OnTopic.Tests/ViewModels/Metadata/TopicReferenceAttributeTopicViewModel.cs b/OnTopic.Tests/ViewModels/Metadata/TopicReferenceAttributeTopicViewModel.cs
@@ -3,15 +3,16 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
+using OnTopic.Metadata.AttributeTypes;
 
 namespace OnTopic.Tests.ViewModels.Metadata {
 
   /*============================================================================================================================
   | VIEW MODEL: TOPIC REFERENCE ATTRIBUTE (DESCRIPTOR)
   \---------------------------------------------------------------------------------------------------------------------------*/
   /// <summary>
-  ///   Provides a strongly-typed data transfer object for testing view models with properties that map to custom collections
-  ///   on the source <see cref="Topic"/>, as part of <see cref="TopicMappingServiceTest.CustomCollection"/>.
+  ///   Provides a dummy implementation of a view model for an <see cref="AttributeTypeDescriptor"/> view model, in order to
+  ///   allow the dynamic resolution of mapping <see cref="TopicReferenceAttribute"/> topics to view models.
   /// </summary>
   /// <remarks>
   ///   This is a sample class intended for test purposes only; it is not designed for use in a production environment.