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

update casing to match model updates

Browse Source
This commit is contained in:
Mads Rasmussen
2018-10-22 12:34:48 +02:00
parent 2062672eda
commit 126ed536ed
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html
View File

@@ -28,14 +28,14 @@
<tbody>
<tr ng-repeat="domain in vm.domains">
<td>
<input style="width: 100%; margin-bottom: 0;" type="text" ng-model="domain.Name" name="domain_name_{{$index}}" />
<input style="width: 100%; margin-bottom: 0;" type="text" ng-model="domain.name" name="domain_name_{{$index}}" />
<span ng-if="vm.domainForm.$submitted" ng-messages="vm.domainForm['domain_name_' + $index].$error">
<span class="help-inline" ng-message="multi"><localize key="assignDomain_duplicateDomain"></localize></span>
<span class="help-inline" ng-message="pattern"><localize key="assignDomain_invalidDomain"></localize></span>
</span>
</td>
<td>
<select style="width: 100%; margin-bottom: 0;" name="domain_language_{{$index}}" class="language" ng-model="domain.Lang" ng-options="lang.name for lang in vm.languages"></select>
<select style="width: 100%; margin-bottom: 0;" name="domain_language_{{$index}}" class="language" ng-model="domain.lang" ng-options="lang.name for lang in vm.languages"></select>
</td>
<td>
<umb-button
@@ -65,7 +65,7 @@
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<umb-button
label-key="general_cancel"
label-key="general_close"
action="vm.closeDialog()"
type="button"
button-style="link">

32
src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
View File

@@ -15,6 +15,7 @@
function activate() {
languageResource.getAll().then(function (langs) {
vm.languages = langs;
var defLang = langs.filter(function (l) {
return l.isDefault;
});
@@ -37,9 +38,10 @@
function getCultureAndDomains () {
contentResource.getCultureAndDomains($scope.currentNode.id)
.then(function (data) {
if (data.Language !== "undefined") {
if (data.language !== "undefined") {
var lang = vm.languages.filter(function (l) {
return matchLanguageById(l, data.Language.Id);
return matchLanguageById(l, data.language.Id);
});
if (lang.length > 0) {
@@ -47,13 +49,13 @@
}
}
vm.domains = data.Domains.map(function (d) {
vm.domains = data.domains.map(function (d) {
var matchedLangs = vm.languages.filter(function (lng) {
return matchLanguageById(lng, d.Lang);
return matchLanguageById(lng, d.lang);
});
return {
Name: d.Name,
Lang: matchedLangs.length > 0 ? matchedLangs[0] : vm.defaultLanguage
name: d.name,
lang: matchedLangs.length > 0 ? matchedLangs[0] : vm.defaultLanguage
}
});
});
@@ -71,8 +73,8 @@
function addDomain() {
vm.domains.push({
Name: '',
Lang: vm.defaultLanguage
name: '',
lang: vm.defaultLanguage
});
}
@@ -85,11 +87,11 @@
if (vm.domains.length > 1) {
vm.domains.map(function (d, index) {
if (d.Name in duplicateTest) {
if (d.name in duplicateTest) {
valid = false;
}
else {
duplicateTest[d.Name] = index;
duplicateTest[d.name] = index;
}
});
}
@@ -102,14 +104,14 @@
if (vm.domainForm.$valid) {
var data = {
NodeId: $scope.currentNode.id,
Domains: vm.domains.map(function (d) {
nodeId: $scope.currentNode.id,
domains: vm.domains.map(function (d) {
return {
Name: d.Name,
Lang: d.Lang.id
name: d.name,
lang: d.lang.id
};
}),
Language: vm.language != null ? vm.language.id : 0
language: vm.language != null ? vm.language.id : 0
};
contentResource.saveLanguageAndDomains(data).then(function () {
vm.submitButtonState = "success";