Skip to content

Don't allow to select folder in create dialog under media type #14840

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

Merged
emmagarland merged 3 commits into from
Nov 3, 2023
Merged

Don't allow to select folder in create dialog under media type #14840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac0f96f
Only allow creating folder at root or under another folder
bjarnef Sep 19, 2023
a3e841d
Fix typos in error message
bjarnef Sep 20, 2023
168f9bd
Add data-element to member type create dialog
bjarnef Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
"contentTypeApiBaseUrl",
"DeleteContainer",
[{ id: id }])),
'Failed to delete content type contaier');
'Failed to delete content type container');
},

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ function mediaTypeResource($q, $http, umbRequestHelper, umbDataFormatter, locali
"mediaTypeApiBaseUrl",
"DeleteContainer",
[{ id: id }])),
'Failed to delete content type contaier');
'Failed to delete content type container');
},

/**
Expand Down
5 changes: 3 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
function MediaTypesCreateController($scope, $location, navigationService, mediaTypeResource, formHelper, appState, localizationService) {

$scope.model = {
folderName: "",
creatingFolder: false
allowCreateFolder: $scope.currentNode.parentId === null || $scope.currentNode.nodeType === 'container',
folderName: "",
creatingFolder: false
};

var node = $scope.currentNode;
Expand Down
20 changes: 11 additions & 9 deletions src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,21 @@ <h5>
</h5>

<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<button class="umb-action-link umb-outline btn-reset" ng-click="createMediaType()" type="button"
umb-auto-focus>
<li data-element="action-mediaType" class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMediaType()" umb-auto-focus>
<umb-icon class="icon large" icon="icon-item-arrangement"></umb-icon>
<span class="menu-label">
<localize key="general_new">New</localize>
<localize key="content_mediatype">Media type</localize>
</span>
<localize key="general_new">New</localize>
<localize key="content_mediatype">Media type</localize>
</span>
</button>
</li>
<li class="umb-action">
<button class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()" type="button">
<li data-element="action-folder" class="umb-action" ng-if="model.allowCreateFolder">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
<umb-icon class="icon large" icon="icon-folder"></umb-icon>
<span class="menu-label"><localize key="general_folder">Folder</localize>...</span>
<span class="menu-label">
<localize key="general_folder">Folder</localize>
</span>
</button>
</li>
</ul>
Expand All @@ -35,6 +36,7 @@ <h5>
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>

</div>

<div ng-cloak ng-show="model.creatingFolder">
Expand Down
5 changes: 3 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/memberTypes/create.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
function MemberTypesCreateController($scope, $location, navigationService, memberTypeResource, formHelper, appState, localizationService) {

$scope.model = {
folderName: "",
creatingFolder: false
allowCreateFolder: $scope.currentNode.parentId === null || $scope.currentNode.nodeType === 'container',
folderName: "",
creatingFolder: false
};

var node = $scope.currentNode;
Expand Down
21 changes: 11 additions & 10 deletions src/Umbraco.Web.UI.Client/src/views/memberTypes/create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
<div ng-controller="Umbraco.Editors.MemberTypes.CreateController">

<div class="umbracoDialog umb-dialog-body with-footer">
<div class="umb-pane" ng-if="!model.creatingFolder">
<h5>
<localize key="create_createUnder">Create a type under</localize> {{currentNode.name}}
</h5>

<ul class="umb-actions umb-actions-child">
<li class="umb-action">
<li data-element="action-memberType" class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType()">
<umb-icon icon="icon-item-arrangement" class="icon large"></umb-icon>
<span class="menu-label">
<localize key="general_new">New</localize>
<localize key="content_memberType">Member type</localize>
</span>
</button>
</li>
<li data-element="action-folder" class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="showCreateFolder()">
<umb-icon icon="icon-folder" class="icon large"></umb-icon>
<span class="menu-label">
<localize key="general_folder">Folder</localize>
</span>
</button>
</li>
<li class="umb-action">
<button type="button" class="umb-action-link umb-outline btn-reset" ng-click="createMemberType()">
<umb-icon icon="icon-item-arrangement" class="icon large"></umb-icon>
<span class="menu-label">
<localize key="general_new">New</localize>&nbsp;
<localize key="content_memberType">Member type</localize>
</span>
</button>
</li>
</ul>
</div>

Expand Down