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

Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions

Browse Source
This commit is contained in:
Shannon
2017-06-06 01:21:17 +02:00
parent 7533b0e704 d72af87790
commit 7f03a97a78
3 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.html
View File

@@ -39,16 +39,16 @@
<div class="umb-user-group-picker-list-item__permission">
<span>
<span class="bold">Content start node:</span>
<span ng-repeat="startNode in userGroup.startNodesContent">{{ startNode.name }}<span ng-if="!$last">, </span></span>
<span ng-if="userGroup.startNodeContent === 0">Content root</span>
<span ng-if="userGroup.startContentId">{{ startNode.name }}</span>
<span ng-if="!userGroup.startContentId">Content root</span>
</span>
</div>
<div class="umb-user-group-picker-list-item__permission">
<span>
<span class="bold">Media start node:</span>
<span ng-repeat="startNode in userGroup.startNodesMedia">{{ startNode.name }}<span ng-if="!$last">, </span></span>
<span ng-if="userGroup.startNodeMedia === 0">Media root</span>
<span ng-if="userGroup.startMediaId">{{ startNode.name }}</span>
<span ng-if="!userGroup.startMediaId">Media root</span>
</span>
</div>
</div>

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

@@ -116,7 +116,7 @@
}
function openMediaPicker() {
vm.contentPicker = {
vm.mediaPicker = {
title: "Select media start node",
view: "treepicker",
section: "media",
@@ -128,12 +128,12 @@
if (model.selection) {
vm.user.startNodesMedia = model.selection;
}
vm.contentPicker.show = false;
vm.contentPicker = null;
vm.mediaPicker.show = false;
vm.mediaPicker = null;
},
close: function (oldModel) {
vm.contentPicker.show = false;
vm.contentPicker = null;
vm.mediaPicker.show = false;
vm.mediaPicker = null;
}
};
}

22
src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
View File

@@ -12,28 +12,6 @@
</umb-button>
</umb-editor-sub-header-content-left>
<umb-editor-sub-header-content-right ng-if="vm.selection.length === 0">
<umb-editor-sub-header-section>
<ng-form class="form-search -no-margin-bottom pull-right" novalidate>
<div class="inner-addon left-addon">
<i class="icon icon-search" ng-click="enterSearch($event)"></i>
<input
class="form-control search-input"
type="text"
localize="placeholder"
placeholder="@general_typeToSearch"
ng-model="options.filter"
ng-change="enterSearch()"
ng-keydown="forceSearch($event)"
prevent-enter-submit
no-dirty-check>
</div>
</ng-form>
</umb-editor-sub-header-section>
</umb-editor-sub-header-content-right>
<!-- With selection -->
<umb-editor-sub-header-content-left ng-if="vm.selection.length > 0">
<umb-editor-sub-header-section>