Skip to content

Commit b226a7e

Browse files
committed
Merge branch 'maintenance/Pre-Release-Cleanup' into develop
Final cleanup in preparation for release This includes, most notably: - Ensure the `TopicReferenceAttributeViewComponent` honors the current key, instead of being hard-coded to use `TopicID` (eb84431). - Expose new `ExportOptions.TranslateTopicPointers` opt-out to the `Export()` interface (5630bb7). - Fix link to the `ContentTypeDescriptor` from the editor interface (9b4ebf6).
2 parents 222b332 + 9b4ebf6 commit b226a7e

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TopicReference/Default.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
@{
44
var attributeDescriptor = new TokenizedTopicListAttributeTopicViewModel() {
5-
Key = "TopicID",
5+
Key = Model.AttributeDescriptor.Key,
66
ContentType = "TokenizedTopicListAttribute",
77
Description = Model.AttributeDescriptor.Description,
88
Title = Model.AttributeDescriptor.Title,

OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Edit.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<h3 class="h5">Topic Information</h3>
7272
<dl>
7373
<dt><i class="fa fa-cogs"></i> Content Type</dt>
74-
<dd><a href="/Configuration/ContentTypes/@Model.Topic.ContentType">@Model.Topic.ContentType</a></dd>
74+
<dd><a href="/OnTopic/Edit/@Model.ContentTypeDescriptor.WebPath">@Model.Topic.ContentType</a></dd>
7575
<dt><i class="fa fa-database"></i> Topic ID</dt>
7676
<dd><a href="/Topic/@Model.Topic.Id/">@Model.Topic.Id</a></dd>
7777
<dt><i class="fa fa-eye"></i> Current</dt>

OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Export.cshtml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@
3737
<i class="fa fa-info-circle" data-toggle="tooltip" data-placement="right" title="Includes relationships even if the topic they are referencing falls outside the scope of the export."></i>
3838
</section>
3939

40+
<section class="attribute">
41+
<input type="checkbox" asp-for="ExportOptions.TranslateTopicPointers" />
42+
<label asp-for="ExportOptions.TranslateTopicPointers">Translate Topic Pointers?</label>
43+
<i class="fa fa-info-circle" data-toggle="tooltip" data-placement="right" title="Attributes which end in 'Id' and have a numeric value mapping to an existing topic will be translated to their unique key (e.g., 'Root:Web:Contact') on export, and then translated back to topic identifiers on import. This is enabled by default, but can optionally be disabled."></i>
44+
</section>
45+
4046
</div>
4147

4248
@if (!Model.IsModal) {

0 commit comments

Comments
 (0)