Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

created an add current domain button to the cultures and hostnames sc… #13436

Merged
merged 2 commits into from
Nov 25, 2022
Merged

created an add current domain button to the cultures and hostnames sc… #13436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cd22ae
created an add current domain button to the cultures and hostnames sc…
prjseal Nov 17, 2022
fa32b85
removed unwanted space
prjseal Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/en.xml
View file
Open in desktop
Expand Up @@ -90,7 +90,8 @@
</area>
<area alias="assignDomain">
<key alias="permissionDenied">Permission denied.</key>
<key alias="addNew">Add new Domain</key>
<key alias="addNew">Add new domain</key>
<key alias="addCurrent">Add current domain</key>
<key alias="remove">remove</key>
<key alias="invalidNode">Invalid node.</key>
<key alias="invalidDomain">One or more domains have an invalid format.</key>
Expand Down
3 changes: 2 additions & 1 deletion src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
View file
Open in desktop
Expand Up @@ -92,7 +92,8 @@
</area>
<area alias="assignDomain">
<key alias="permissionDenied">Permission denied.</key>
<key alias="addNew">Add new Domain</key>
<key alias="addNew">Add new domain</key>
<key alias="addCurrent">Add current domain</key>
<key alias="remove">remove</key>
<key alias="invalidNode">Invalid node.</key>
<key alias="invalidDomain">One or more domains have an invalid format.</key>
Expand Down
7 changes: 7 additions & 0 deletions src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html
View file
Open in desktop
Expand Up @@ -83,6 +83,13 @@ <h5 class="umb-pane-title"><localize key="assignDomain_setDomains">Domains</loca
button-style="info">
</umb-button>

<umb-button
label-key="assignDomain_addCurrent"
action="vm.addCurrentDomain()"
type="button"
button-style="success">
</umb-button>

</umb-pane>

</div>
Expand Down
15 changes: 14 additions & 1 deletion src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
View file
Open in desktop
@@ -1,11 +1,12 @@
(function () {
"use strict";

function AssignDomainController($scope, localizationService, languageResource, contentResource, navigationService, notificationsService) {
function AssignDomainController($scope, localizationService, languageResource, contentResource, navigationService, notificationsService, $location) {
var vm = this;

vm.closeDialog = closeDialog;
vm.addDomain = addDomain;
vm.addCurrentDomain = addCurrentDomain;
vm.removeDomain = removeDomain;
vm.save = save;
vm.languages = [];
Expand Down Expand Up @@ -82,6 +83,18 @@
});
}

function addCurrentDomain() {
var domainToAdd = $location.host();
var port = $location.port();
if (port != 80 && port != 443) {
domainToAdd += ":" + port;
}
vm.domains.push({
name: domainToAdd,
lang: vm.defaultLanguage
});
}

function removeDomain(index) {
vm.domains.splice(index, 1);
}
Expand Down