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

Fixes merge issues, ensures "Content root" and "Media root" are localized

Browse Source
This commit is contained in:
Shannon
2017-08-01 12:41:22 +10:00
parent cee3f456d1
commit 2e6fb8e3e5
7 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
View File

@@ -7,9 +7,7 @@
var localizeSaving = localizationService.localize("general_saving");
vm.page = {};
vm.page.contentRootLabel = "Content Root";
vm.page.mediaRootLabel = "Media Root";
vm.page = {};
vm.page.rootIcon = "icon-folder";
vm.userGroup = {};
vm.labels = {};
@@ -34,7 +32,9 @@
"defaultdialogs_selectContentStartNode",
"defaultdialogs_selectMediaStartNode",
"defaultdialogs_selectNode",
"general_groups"
"general_groups",
"content_contentRoot",
"media_mediaRoot"
];
localizationService.localizeMany(labelKeys).then(function (values) {
@@ -43,6 +43,8 @@
vm.labels.selectMediaStartNode = values[2];
vm.labels.selectNode = values[3];
vm.labels.groups = values[4];
vm.labels.contentRoot = values[5];
vm.labels.mediaRoot = values[6];
});
localizationService.localize("general_add").then(function (name) {
vm.labels.add = name;
@@ -133,7 +135,7 @@
if (model.selection) {
vm.userGroup.contentStartNode = model.selection[0];
if (vm.userGroup.contentStartNode.id === "-1") {
vm.userGroup.contentStartNode.name = "Content Root";
vm.userGroup.contentStartNode.name = vm.labels.contentRoot;
vm.userGroup.contentStartNode.icon = "icon-folder";
}
}
@@ -161,7 +163,7 @@
if (model.selection) {
vm.userGroup.mediaStartNode = model.selection[0];
if (vm.userGroup.mediaStartNode.id === "-1") {
vm.userGroup.mediaStartNode.name = "Media Root";
vm.userGroup.mediaStartNode.name = vm.labels.mediaRoot;
vm.userGroup.mediaStartNode.icon = "icon-folder";
}
}

4
src/Umbraco.Web.UI.Client/src/views/users/group.html
View File

@@ -80,9 +80,9 @@
<umb-node-preview
ng-if="!vm.userGroup.mediaStartNode"
style="max-width: 100%;"
icon="vm.page.rootIcon"
name="vm.page.mediaRootLabel"
name="vm.labels.noStartNode"
allow-edit="true"
edit-label-key="'general_add'"
on-edit="vm.openMediaPicker()">
</umb-node-preview>

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

@@ -6,8 +6,6 @@
var vm = this;
vm.page = {};
vm.page.contentRootLabel = "Content Root";
vm.page.mediaRootLabel = "Media Root";
vm.page.rootIcon = "icon-folder";
vm.user = {
changePassword: null
@@ -39,7 +37,9 @@
"general_cancel",
"defaultdialogs_selectContentStartNode",
"defaultdialogs_selectMediaStartNode",
"sections_users"
"sections_users",
"content_contentRoot",
"media_mediaRoot"
];
localizationService.localizeMany(labelKeys).then(function (values) {
@@ -48,6 +48,8 @@
vm.labels.selectContentStartNode = values[2];
vm.labels.selectMediaStartNode = values[3];
vm.labels.users = values[4];
vm.labels.contentRoot = values[5];
vm.labels.mediaRoot = values[6];
});
// get user
@@ -150,7 +152,7 @@
if (model.selection) {
angular.forEach(model.selection, function (item) {
if (item.id === "-1") {
item.name = "Content Root";
item.name = vm.labels.contentRoot;
item.icon = "icon-folder";
}
multiSelectItem(item, vm.user.startContentIds);
@@ -183,7 +185,7 @@
if (model.selection) {
angular.forEach(model.selection, function (item) {
if (item.id === "-1") {
item.name = "Media Root";
item.name = vm.labels.mediaRoot;
item.icon = "icon-folder";
}
multiSelectItem(item, vm.user.startMediaIds);

3
src/Umbraco.Web.UI.Client/src/views/users/user.html
View File

@@ -110,8 +110,7 @@
<umb-node-preview
ng-if="vm.user.startContentIds.length === 0"
style="max-width: 100%;"
icon="vm.page.rootIcon"
name="vm.page.contentRootLabel"
name="vm.page.noStartNodeLabel"
allow-remove="false">
</umb-node-preview>