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

Merge branch 'v9/dev' into v9/contrib

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs
This commit is contained in:
Sebastiaan Janssen
2022-04-12 13:41:34 +02:00
parent 5bac054311 20666218d2
commit 4e71d6f2f6
87 changed files with 2050 additions and 640 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();
});

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

@@ -16,17 +16,16 @@
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 descendant items have dependencies";
localizationService.localize(this.hideNoneDependencies ? "references_labelDependsOnThis" : "references_labelUsedByItems").then(function (value) {
vm.referencesTitle = value;
});
localizationService.localize(this.hideNoneDependencies ? "references_labelDependentDescendants" : "references_labelUsedDescendants").then(function (value) {
vm.referencedDescendantsTitle = value;
});
vm.descendantsOptions = {};
vm.descendantsOptions.filterMustBeIsDependency = this.hideNoneDependencies;
vm.hasReferencesInDescendants = false;

4
src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
View File

@@ -1259,7 +1259,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
getPublicAccess: function (contentId) {
return umbRequestHelper.resourcePromise(
$http.get(
umbRequestHelper.getApiUrl("contentApiBaseUrl", "GetPublicAccess", {
umbRequestHelper.getApiUrl("publicAccessApiBaseUrl", "GetPublicAccess", {
contentId: contentId
})
),
@@ -1308,7 +1308,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
}
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostPublicAccess", publicAccess)
umbRequestHelper.getApiUrl("publicAccessApiBaseUrl", "PostPublicAccess", publicAccess)
),
"Failed to update public access for content item with id " + contentId
);

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,

6
src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
View File

@@ -128,13 +128,13 @@
<!-- Links -->
<div class="umb-help-section" data-element="help-links" ng-if="vm.hasAccessToSettings">
<a data-element="help-link-umbraco-tv" class="umb-help-badge" href="https://umbraco.tv?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv" target="_blank" rel="noopener">
<a data-element="help-link-umbraco-tv" class="umb-help-badge" href="https://umbra.co/ulb" target="_blank" rel="noopener">
<umb-icon icon="icon-tv-old" class="umb-help-badge__icon"></umb-icon>
<div class="umb-help-badge__title">
<localize key="help_umbracoTv">Visit umbraco.tv</localize>
<localize key="help_umbracoLearningBase">Watch our free tutorial videos</localize>
</div>
<small>
<localize key="help_theBestUmbracoVideoTutorials">The best Umbraco video tutorials</localize>
<localize key="help_umbracoLearningBaseDescription">on the Umbraco Learning Base</localize>
</small>
</a>

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>

12
src/Umbraco.Web.UI.Client/src/views/content/content.protect.controller.js
View File

@@ -1,7 +1,7 @@
(function () {
"use strict";
function ContentProtectController($scope, $q, contentResource, memberResource, memberGroupResource, navigationService, localizationService, editorService) {
function ContentProtectController($scope, $q, publicAccessResource, memberResource, memberGroupResource, navigationService, localizationService, editorService) {
var vm = this;
var id = $scope.currentNode.id;
@@ -30,7 +30,7 @@
vm.loading = true;
// get the current public access protection
contentResource.getPublicAccess(id).then(function (publicAccess) {
publicAccessResource.getPublicAccess(id).then(function (publicAccess) {
vm.loading = false;
// init the current settings for public access (if any)
@@ -94,7 +94,7 @@
vm.buttonState = "busy";
var groups = _.map(vm.groups, function (group) { return encodeURIComponent(group.name); });
var usernames = _.map(vm.members, function (member) { return member.username; });
contentResource.updatePublicAccess(id, groups, usernames, vm.loginPage.id, vm.errorPage.id).then(
publicAccessResource.updatePublicAccess(id, groups, usernames, vm.loginPage.id, vm.errorPage.id).then(
function () {
localizationService.localize("publicAccess_paIsProtected", [$scope.currentNode.name]).then(function (value) {
vm.success = {
@@ -181,11 +181,11 @@
vm.members.push(newMember);
}
})
);
);
});
editorService.close();
navigationService.allowHideDialog(true);
// wait for all the member lookups to complete
// wait for all the member lookups to complete
vm.loading = true;
$q.all(promises).then(function() {
vm.loading = false;
@@ -239,7 +239,7 @@
function removeProtectionConfirm() {
vm.buttonState = "busy";
contentResource.removePublicAccess(id).then(
publicAccessResource.removePublicAccess(id).then(
function () {
localizationService.localize("publicAccess_paIsRemoved", [$scope.currentNode.name]).then(function(value) {
vm.success = {

2
src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
View File

@@ -17,7 +17,7 @@
<localize key="settingsDashboard_bulletPointTwo">Ask a question in the <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank" rel="noopener">Community Forum</a></localize>
</li>
<li>
<localize key="settingsDashboard_bulletPointTutorials">Watch our free <a class="btn-link -underline" href="https://www.youtube.com/c/UmbracoLearningBase" target="_blank" rel="noopener">tutorial videos on the Umbraco Learning Base</a></localize>
<localize key="settingsDashboard_bulletPointTutorials">Watch our free <a class="btn-link -underline" href="https://umbra.co/ulb" target="_blank" rel="noopener">tutorial videos on the Umbraco Learning Base</a></localize>
</li>
<li>
<localize key="settingsDashboard_bulletPointFour">Find out about our <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank" rel="noopener">productivity boosting tools and commercial support</a></localize>

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js
View File

@@ -174,13 +174,13 @@
filterCssClass: "not-allowed",
select: node => {
const filepath = decodeURIComponent(node.id.replace(/\+/g, " "));
block.view = "~/" + filepath;
block.view = "~/" + filepath.replace("wwwroot/", "");
editorService.close();
},
close: () => editorService.close()
};
editorService.filePicker(filePicker);
editorService.staticFilePicker(filePicker);
});
};