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

V8: Add irreversible warning when deleting items from the recycle bin (#6600)

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-10-16 15:28:03 +02:00
committed by Sebastiaan Janssen
parent 82b8302f25
commit 6c6b23c465
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,10 +14,14 @@
<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
</p>
<div class="umb-alert umb-alert--warning" ng-show="hasMoreThanOneLanguage">
<div class="umb-alert umb-alert--warning" ng-show="hasMoreThanOneLanguage && !currentNode.trashed">
<localize key="defaultdialogs_variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</localize>
</div>
<div class="umb-alert umb-alert--warning" ng-show="currentNode.trashed">
<localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
</div>
<umb-confirm on-confirm="performDelete" confirm-button-style="danger" on-cancel="cancel"></umb-confirm>
</div>

6
src/Umbraco.Web.UI.Client/src/views/media/delete.html
View File

@@ -14,7 +14,11 @@
<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
</p>
<umb-confirm on-confirm="performDelete" on-cancel="close"></umb-confirm>
<div class="umb-alert umb-alert--warning" ng-show="currentNode.trashed">
<localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
</div>
<umb-confirm on-confirm="performDelete" on-cancel="close" confirm-button-style="danger"></umb-confirm>
</div>
</div>

1
src/Umbraco.Web/Trees/TreeControllerBase.cs
View File

@@ -265,6 +265,7 @@ namespace Umbraco.Web.Trees
treeNode.Path = entity.Path;
treeNode.Udi = Udi.Create(ObjectTypes.GetUdiType(entityObjectType), entity.Key);
treeNode.HasChildren = hasChildren;
treeNode.Trashed = entity.Trashed;
return treeNode;
}