yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Item tracking fixes (#12146)

Browse Source 
* Cleanup; Fix lang keys

* Documentation

* Typos

* Distinct the results

* Changed GetPagedRelationsForItems to GetPagedRelationsForItem as we would only expect a single id to be passed when calling this + fix more docs

* Changed to the correct reference

* Unused code

* Only load references when info tab is clicked

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
This commit is contained in:
Elitsa Marinovska
2022-03-18 11:21:49 +01:00
committed by GitHub
parent 30a30731ec
commit 3044f8df04
17 changed files with 175 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
View File

@@ -12,6 +12,7 @@
scope.publishStatus = [];
scope.currentVariant = null;
scope.currentUrls = [];
scope.loadingReferences = false;
scope.disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates;
scope.allowChangeDocumentType = false;
@@ -229,6 +230,10 @@
});
}
function loadReferences(){
scope.loadingReferences = true;
}
function loadRedirectUrls() {
scope.loadingRedirectUrls = true;
//check if Redirect URL Management is enabled
@@ -335,6 +340,7 @@
loadRedirectUrls();
setNodePublishStatus();
formatDatesToLocal();
loadReferences();
} else {
isInfoTab = false;
}
@@ -352,6 +358,7 @@
loadRedirectUrls();
setNodePublishStatus();
formatDatesToLocal();
loadReferences();
}
updateCurrentUrls();
});

4
src/Umbraco.Web.UI.Client/src/common/directives/components/references/umbtrackedreferences.component.js
View File

@@ -16,8 +16,8 @@
function onInit() {
vm.referencesTitle = this.hideNoneDependencies ? "The following items depends on this" : "Referenced by the following items";
vm.referencedDescendantsTitle = this.hideNoneDependencies ? "The following descending items has dependencies" : "The following descending items are referenced";
vm.referencesTitle = this.hideNoneDependencies ? "The following items depend on this" : "Referenced by the following items";
vm.referencedDescendantsTitle = this.hideNoneDependencies ? "The following descending items have dependencies" : "The following descending items are referenced";
localizationService.localize(this.hideNoneDependencies ? "references_labelDependsOnThis" : "references_labelUsedByItems").then(function (value) {
vm.referencesTitle = value;

2
src/Umbraco.Web.UI.Client/src/common/resources/trackedreferences.resource.js
View File

@@ -162,7 +162,7 @@ function trackedReferencesResource($q, $http, umbRequestHelper) {
$http.post(
umbRequestHelper.getApiUrl(
"trackedReferencesApiBaseUrl",
"getPagedReferencedItems",
"GetPagedReferencedItems",
query),
{
ids: ids,

2
src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
View File

@@ -21,7 +21,7 @@
</umb-box-content>
</umb-box>
<umb-tracked-references id="node.id"></umb-tracked-references>
<umb-tracked-references id="node.id" ng-if="loadingReferences" ></umb-tracked-references>
<umb-box data-element="node-info-redirects" ng-cloak ng-show="!urlTrackerDisabled && hasRedirects">
<umb-box-header title-key="redirectUrls_redirectUrlManagement"></umb-box-header>

4
src/Umbraco.Web.UI.Client/src/views/components/references/umb-tracked-references-table.html
View File

@@ -7,8 +7,8 @@
<div class="umb-table-head">
<div class="umb-table-row">
<div class="umb-table-cell"></div>
<div class="umb-table-cell umb-table__name not-fixed"><localize key="general_nodename">Node Name</localize></div>
<div ng-if="vm.showTypeName" class="umb-table-cell"><localize key="general_typename">Type Name</localize></div>
<div class="umb-table-cell umb-table__name not-fixed"><localize key="general_nodeName">Node Name</localize></div>
<div ng-if="vm.showTypeName" class="umb-table-cell"><localize key="general_typeName">Type Name</localize></div>
<div ng-if="vm.showType" class="umb-table-cell"><localize key="general_type">Type</localize></div>
<div ng-if="vm.showRelationTypeName" class="umb-table-cell"><localize key="relationType_relation">Relation</localize></div>
</div>

10
src/Umbraco.Web.UI.Client/src/views/components/references/umb-tracked-references.html
View File

@@ -26,11 +26,11 @@
</div>
<div ng-if="vm.hasReferencesInDescendants">
<umb-tracked-references-table items="vm.referencedDescendants.items"
total-pages="vm.referencedDescendants.totalPages"
page-number="vm.referencedDescendants.pageNumber"
headline="vm.referencedDescendantsTitle"
on-page-changed="vm.changeDescendantsPageNumber(pageNumber)">
<umb-tracked-references-table items="vm.referencedDescendants.items"
total-pages="vm.referencedDescendants.totalPages"
page-number="vm.referencedDescendants.pageNumber"
headline="vm.referencedDescendantsTitle"
on-page-changed="vm.changeDescendantsPageNumber(pageNumber)">
</umb-tracked-references-table>
</div>
</div>

2
src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
View File

@@ -374,7 +374,7 @@
}
function enableUser() {
vm.enableUserButtonState = "busfy";
vm.enableUserButtonState = "busy";
usersResource.enableUsers([vm.user.id]).then(function (data) {
vm.user.userState = "Active";
setUserDisplayState();