Index: ../magnolia-git/magnolia_ui/security-app/src/main/resources/mgnl-bootstrap/security-app/config.modules.security-app.apps.security.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ../magnolia-git/magnolia_ui/security-app/src/main/resources/mgnl-bootstrap/security-app/config.modules.security-app.apps.security.xml (revision Local version)
+++ ../magnolia-git/magnolia_ui/security-app/src/main/resources/mgnl-bootstrap/security-app/config.modules.security-app.apps.security.xml (revision Shelved version)
@@ -123,11 +123,14 @@
superuser
- 2013-06-13T16:11:02.920+02:00
+ 2013-06-14T17:29:24.835+02:00
superuser
+
+ info.magnolia.ui.api.availability.IsNotDeletedRule
+
mgnl:contentNode
@@ -181,6 +184,12 @@
New user
+
+ 2013-06-15T23:51:57.315+02:00
+
+
+ superuser
+
mgnl:user
@@ -204,7 +213,7 @@
superuser
- 2013-05-16T15:43:40.238+02:00
+ 2013-06-15T23:46:55.713+02:00
superuser
@@ -212,6 +221,9 @@
true
+
+ info.magnolia.ui.api.availability.IsNotDeletedRule
+
mgnl:contentNode
@@ -248,11 +260,14 @@
mix:lockable
- e70c4831-aee1-4207-a13f-4fc7233b014c
+ 7ecacbcc-43a6-4fad-83b0-f64813712a98
- info.magnolia.ui.framework.action.DeleteItemActionDefinition
+ info.magnolia.ui.framework.action.MarkNodeAsDeletedActionDefinition
+
+ markAsDeleted
+
icon-delete
@@ -263,7 +278,7 @@
Delete user
- 2013-06-13T15:14:28.317+02:00
+ 2013-06-16T17:12:07.828+02:00
superuser
@@ -272,55 +287,23 @@
mgnl:contentNode
-
- mix:lockable
-
- 87129708-7977-49c2-a70f-2f723d4caf83
+ b296a5cf-d09c-494f-acfc-c127c40c84f9
admin
-
- 2013-05-16T15:43:08.001+02:00
-
-
- superuser
-
- 2013-06-13T16:11:27.438+02:00
+ 2013-06-16T17:13:35.591+02:00
superuser
-
-
- mgnl:contentNode
+
+ info.magnolia.ui.api.availability.IsNotDeletedRule
-
+
-
- 3da7bd46-0f8d-4288-8e27-260b8dc6505b
-
-
- mgnl:user
-
-
- admin
-
-
- 2013-06-13T15:34:29.564+02:00
-
-
- superuser
-
-
- 2013-06-13T16:10:57.406+02:00
-
-
- superuser
-
-
-
+
+
-
mgnl:contentNode
@@ -390,7 +373,33 @@
superuser
+
+
+ mgnl:contentNode
+
+
+ dc72f45c-cd7a-4d0d-b320-50e914ae7528
+
+
+ admin
+
+
+ 2013-06-14T17:30:06.817+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:30:29.155+02:00
+
+
+ superuser
+
+
+ info.magnolia.ui.api.availability.IsNotDeletedRule
+
-
+
+
mgnl:contentNode
@@ -445,7 +454,7 @@
2013-04-26T17:41:34.437+02:00
- 2013-04-26T18:30:36.980+02:00
+ 2013-06-14T17:53:08.732+02:00
superuser
@@ -453,64 +462,84 @@
true
-
+
+ info.magnolia.ui.api.availability.IsNotDeletedRule
+
+
mgnl:contentNode
-
- mix:lockable
-
- b175e4f7-45af-4568-96b6-40e1689ff2d0
+ e16ef99b-ada7-46c5-88b8-7d030535ae45
+
+ mgnl:folder
+
admin
- 2013-05-16T15:43:08.001+02:00
+ 2013-06-13T15:34:29.564+02:00
superuser
- 2013-06-13T15:36:57.404+02:00
+ 2013-06-13T15:35:43.287+02:00
superuser
-
- true
-
-
+
+
+
+
-
- mgnl:contentNode
-
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
-
+
- e16ef99b-ada7-46c5-88b8-7d030535ae45
+ e6ce8bb9-d889-4715-a583-1172e319ea5e
-
+
-
- mgnl:folder
+
+ info.magnolia.ui.framework.action.MarkNodeAsDeletedActionDefinition
-
+
+
+ markAsDeleted
+
+
+ icon-delete
+
-
- admin
-
+
+ admin
+
-
- 2013-06-13T15:34:29.564+02:00
+
+ Delete folder
-
+
-
- superuser
-
-
+
- 2013-06-13T15:35:43.287+02:00
+ 2013-06-14T17:39:32.028+02:00
-
-
- superuser
-
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ 3a37fec1-2450-4fec-8e57-3c8a9304d5b7
+
+
+ admin
+
+
+ info.magnolia.ui.api.availability.IsNotDeletedRule
+
-
-
+
+
-
-
-
+
mgnl:contentNode
@@ -518,22 +547,31 @@
mix:lockable
- 56a0f182-fc8d-4543-9e83-bf8910914b41
+ cbf2f7a7-ec5f-40ad-80e2-3f0f5cc0c9d2
- info.magnolia.ui.framework.action.DeleteItemActionDefinition
+ info.magnolia.ui.framework.action.OpenEditDialogActionDefinition
+
+ security-app:folder
+
- icon-delete
+ icon-edit
admin
- Delete folder
+ Rename folder
+
+ false
+
+
+ 2012-11-27T11:57:13.990+01:00
+
- 2013-06-13T15:14:33.059+02:00
+ 2013-06-13T15:28:57.448+02:00
superuser
@@ -546,7 +584,7 @@
mix:lockable
- d3d36818-5469-4040-9dbb-c921fd36414f
+ 0e70d0c7-2ac4-4d88-acb7-78259b18ca7e
admin
@@ -558,17 +596,20 @@
superuser
- 2013-06-13T15:36:27.642+02:00
+ 2013-06-14T17:31:28.895+02:00
superuser
+
+ info.magnolia.ui.api.availability.IsNotDeletedRule
+
mgnl:contentNode
- b7fc1e5c-207a-4b62-8a3b-3d25390855e0
+ 6c07b432-e27d-48f4-ad24-6d99fc1d2f65
mgnl:folder
@@ -591,7 +632,7 @@
-
+
mgnl:contentNode
@@ -599,31 +640,28 @@
mix:lockable
- cbf2f7a7-ec5f-40ad-80e2-3f0f5cc0c9d2
+ bc0c214a-e93b-4b88-9ebe-1533d6901370
- info.magnolia.ui.framework.action.OpenEditDialogActionDefinition
+ info.magnolia.ui.framework.action.ActivationActionDefinition
-
- security-app:folder
+
+ activate
- icon-edit
+ icon-publish
admin
- Rename folder
+ Publish deletion
-
- false
-
- 2012-11-27T11:57:13.990+01:00
+ 2013-02-25T12:38:03.268+01:00
- 2013-06-13T15:28:57.448+02:00
+ 2013-06-14T17:38:43.821+02:00
superuser
@@ -632,56 +670,73 @@
mgnl:contentNode
-
- mix:lockable
-
- 0e70d0c7-2ac4-4d88-acb7-78259b18ca7e
+ ed1e79b3-2e38-44ab-8ab7-84ff0144ffc4
admin
-
- 2013-05-16T15:43:08.001+02:00
-
-
- superuser
-
- 2013-06-13T16:10:12.337+02:00
+ 2013-06-13T14:57:36.430+02:00
superuser
-
+
+ info.magnolia.ui.api.availability.IsDeletedRule
+
+
+
+
-
- mgnl:contentNode
-
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
-
+
- 6c07b432-e27d-48f4-ad24-6d99fc1d2f65
+ f468cb08-29f3-4014-a75c-bead8692cf05
-
+
-
- mgnl:folder
+
+ info.magnolia.ui.contentapp.detail.action.RestorePreviousVersionActionDefinition
-
+
+
+ icon-undo
+
-
- admin
-
+
+ admin
+
-
- 2013-06-13T15:34:29.564+02:00
+
+ Restore previous version
-
+
-
+
+ 2013-06-14T17:37:21.690+02:00
+
+
- superuser
-
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ b46f40f0-625f-41ba-b716-efd72d04feb8
+
+
+ admin
+
-
+
- 2013-06-13T15:35:43.287+02:00
+ 2013-06-13T14:57:54.840+02:00
-
-
- superuser
-
+
+
+ superuser
+
+
+ info.magnolia.ui.api.availability.IsDeletedRule
+
-
-
-
+
+
+
-
mgnl:contentNode
@@ -1174,6 +1229,361 @@
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 2922b89c-7881-4a8a-a837-1a7d48d48905
+
+
+ admin
+
+
+ Deleted user
+
+
+ 2013-06-14T17:33:33.633+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 005cf923-2b61-4aa5-a260-aa188fd00b92
+
+
+ admin
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ a87f4645-418d-469e-8ef0-c8f60e97d4b4
+
+
+ admin
+
+
+ 2013-06-14T17:04:10.124+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 340b87b3-cbd4-4b66-85d8-ca66f850bd76
+
+
+ admin
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 1bf27c9d-25bc-46c5-816e-ecf9f1ba54a6
+
+
+ admin
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ fe912a36-09ee-4da8-8b9c-f99d990d2c0c
+
+
+ admin
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ c7b948d7-85dc-45c4-b7bd-74bde15293c9
+
+
+ admin
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 9182ab82-6937-4e02-8199-5a3ec76be555
+
+
+ admin
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 0dd06d06-9a8c-4120-a3c1-7945b6bf053f
+
+
+ admin
+
+
+ false
+
+
+ 2012-06-11T15:11:28.694+02:00
+
+
+ 2013-01-15T16:10:30.517+01:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 04e2d49d-b767-4edc-b282-317aabeb9d1d
+
+
+ admin
+
+
+ false
+
+
+ 2012-06-11T15:16:11.041+02:00
+
+
+ 2013-02-27T17:12:42.063+01:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 74b1ce05-c84d-4c0a-898b-16438c1eede4
+
+
+ admin
+
+
+ false
+
+
+ 2010-09-08T15:02:53.617+02:00
+
+
+ 2013-06-14T17:28:35.714+02:00
+
+
+ superuser
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 38b018be-29a3-4435-bb66-fb701e60c2a9
+
+
+ admin
+
+
+ false
+
+
+ 2010-09-08T15:02:53.617+02:00
+
+
+ 2013-01-15T16:13:36.498+01:00
+
+
+ superuser
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ 8b24ab35-0cd2-4efb-a923-822185668411
+
+
+ admin
+
+
+ 2013-06-14T17:27:22.995+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:27:35.287+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ 63c0d722-65e5-4b96-97db-39c483bb2c9b
+
+
+ admin
+
+
+ 2013-06-14T17:27:38.698+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:27:43.980+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ 2ec8c845-3542-47ef-a703-dde80ea2caeb
+
+
+ admin
+
+
+ 2013-06-14T17:28:02.707+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:28:14.779+02:00
+
+
+ superuser
+
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ cd5c1feb-d084-4352-b26a-44779aed2314
+
+
+ admin
+
+
+ 2013-05-16T14:35:52.537+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:34:18.756+02:00
+
+
+ superuser
+
+
+ info.magnolia.ui.api.availability.IsDeletedRule
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 6e1f3eab-7fa1-49ea-9957-87d73c274f7d
+
+
+ admin
+
+
+ mgnl:user
+
+
+ 2013-04-26T17:17:17.148+02:00
+
+
+ 2013-05-17T08:44:41.684+02:00
+
+
+ superuser
+
+
+
+
mgnl:contentNode
@@ -1457,6 +1867,500 @@
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 270dc2d5-5cb9-46a5-8591-952a2eac13fe
+
+
+ admin
+
+
+ Deleted folder
+
+
+ false
+
+
+ 2013-04-08T16:47:00.170+02:00
+
+
+ 2013-06-14T17:33:46.187+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ d71067f9-31c9-4b5d-8eb7-b3dbc0e00446
+
+
+ admin
+
+
+ false
+
+
+ 2013-04-08T16:47:31.794+02:00
+
+
+ 2013-04-08T16:49:42.379+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ b73e2e65-a932-4acc-a47e-4d091a7c5694
+
+
+ admin
+
+
+ false
+
+
+ 2013-04-08T16:47:52.496+02:00
+
+
+ 2013-04-08T16:49:42.380+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 92c67ab9-b1b9-4a5f-9ae4-958f329e4c32
+
+
+ admin
+
+
+ false
+
+
+ 2013-04-08T16:48:28.315+02:00
+
+
+ 2013-04-08T16:49:42.387+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ ed78f497-48c0-4e2b-a32d-71cd38af0d9a
+
+
+ admin
+
+
+ false
+
+
+ 2013-04-08T16:48:05.332+02:00
+
+
+ 2013-06-13T15:33:02.714+02:00
+
+
+ superuser
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 06c7a7ce-3118-4226-afa3-2470925eade4
+
+
+ admin
+
+
+ false
+
+
+ 2013-04-08T16:48:05.332+02:00
+
+
+ 2013-04-08T16:50:06.752+02:00
+
+
+ superuser
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 9d33918f-c4e5-460e-afb6-8818149c856a
+
+
+ admin
+
+
+ false
+
+
+ 2013-04-08T16:48:57.925+02:00
+
+
+ 2013-04-08T16:50:19.329+02:00
+
+
+ superuser
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 52665b8b-63f9-4f74-8a0f-17c3a36c140c
+
+
+ admin
+
+
+ false
+
+
+ 2013-04-08T16:47:52.496+02:00
+
+
+ 2013-04-08T16:49:42.388+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 902593a8-f244-4c6b-81ed-767f8c7ce714
+
+
+ admin
+
+
+ false
+
+
+ 2013-04-08T16:48:28.315+02:00
+
+
+ 2013-04-08T16:49:42.388+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 2dabb460-05e8-4229-905e-bfafaa89a60e
+
+
+ admin
+
+
+ false
+
+
+ 2013-04-08T16:48:05.332+02:00
+
+
+ 2013-04-08T16:50:13.984+02:00
+
+
+ superuser
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ ecb2e338-f152-462e-9b7b-cf1bfa59b698
+
+
+ admin
+
+
+ false
+
+
+ 2012-06-11T15:11:28.694+02:00
+
+
+ 2013-06-13T15:39:38.473+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 24598f8b-e996-4862-9920-842e8a442939
+
+
+ admin
+
+
+ false
+
+
+ 2012-06-11T15:16:11.041+02:00
+
+
+ 2013-02-27T17:12:42.063+01:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ a6b01eaa-f595-4877-8d19-0988a1071c5e
+
+
+ admin
+
+
+ false
+
+
+ 2010-09-08T15:02:53.617+02:00
+
+
+ 2013-06-14T17:47:18.615+02:00
+
+
+ superuser
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 33fc957c-7917-42da-8d6d-f730b37a8115
+
+
+ admin
+
+
+ false
+
+
+ 2010-09-08T15:02:53.617+02:00
+
+
+ 2013-06-14T17:47:12.015+02:00
+
+
+ superuser
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ ab13e0b4-71bb-4974-8a44-9ba8c6fca1f1
+
+
+ admin
+
+
+ 2013-06-14T17:27:22.995+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:35:14.233+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ 83d73201-0cc5-4a6d-97f9-54dfa10adc9c
+
+
+ admin
+
+
+ 2013-06-14T17:27:38.698+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:27:43.980+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ 36fb6c9e-53fc-44e6-9aeb-fe1f30d2c240
+
+
+ admin
+
+
+ 2013-06-14T17:28:02.707+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:28:14.779+02:00
+
+
+ superuser
+
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 13c6f1e6-0755-429a-9b92-7d6c0ba62291
+
+
+ admin
+
+
+ false
+
+
+ 2013-04-26T17:17:05.038+02:00
+
+
+ 2013-06-14T17:34:22.634+02:00
+
+
+ superuser
+
+
+ info.magnolia.ui.api.availability.IsDeletedRule
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 900121b7-1c61-4347-aafc-93ce5682256f
+
+
+ admin
+
+
+ mgnl:folder
+
+
+ false
+
+
+ 2013-04-26T17:17:17.148+02:00
+
+
+ 2013-04-26T17:18:36.040+02:00
+
+
+ superuser
+
+
+
+
mgnl:contentNode
@@ -2119,11 +3023,14 @@
mix:lockable
- 3b4fd922-2b79-4d08-ae54-a51db7eb6ada
+ 9cc33b76-6e3e-4df3-bf48-cbd328724dbb
- info.magnolia.ui.framework.action.DeleteItemActionDefinition
+ info.magnolia.ui.framework.action.MarkNodeAsDeletedActionDefinition
+
+ markAsDeleted
+
icon-delete
@@ -2133,7 +3040,39 @@
Delete group
+
+ 2013-06-16T17:22:22.038+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ a5d3009d-acad-4e55-903e-5836f57b7c48
+
+
+ admin
+
+
+ 2013-06-16T17:12:22.799+02:00
+
+
+ superuser
+
+
+ 2013-06-16T17:13:41.966+02:00
+
+
+ superuser
+
+
+ info.magnolia.ui.api.availability.IsNotDeletedRule
+
-
+
+
mgnl:contentNode
@@ -2159,7 +3098,33 @@
Edit group
+
+
+ mgnl:contentNode
+
+
+ 3c0dbcb6-1b83-4914-bcf5-a8ef65ae1e0c
+
+
+ admin
+
+
+ 2013-06-16T17:12:22.799+02:00
+
+
+ superuser
+
+
+ 2013-06-16T17:15:49.680+02:00
+
+
+ superuser
+
+
+ info.magnolia.ui.api.availability.IsNotDeletedRule
+
-
+
+
mgnl:contentNode
@@ -2212,7 +3177,59 @@
superuser
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ d2cb47c8-2407-44d0-a980-58061da448d5
+
+
+ /modules/security-app/apps/security/subApps/users/actions/activateDeleted
+
+
+ admin
+
+
+ 2013-02-25T12:38:03.268+01:00
+
+
+ 2013-06-16T17:05:06.609+02:00
+
+
+ superuser
+
-
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 94fe3eef-4663-4da8-9e09-2333d21ef633
+
+
+ /modules/security-app/apps/security/subApps/users/actions/restorePreviousVersion
+
+
+ admin
+
+
+ 2013-02-25T12:38:03.268+01:00
+
+
+ 2013-06-16T17:06:22.624+02:00
+
+
+ superuser
+
+
+
mgnl:contentNode
@@ -2650,6 +3667,273 @@
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 2441dca8-af5b-4910-a6cd-a0808e7e7244
+
+
+ admin
+
+
+ Deleted group
+
+
+ 2013-06-16T17:15:13.983+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 64fa6070-ad49-4fdb-b46b-c052dbeb774d
+
+
+ admin
+
+
+
+ mgnl:contentNode
+
+
+ 05d1da3f-bf20-4be2-9801-71a8c14cc1b7
+
+
+ admin
+
+
+ 2013-06-14T17:11:32.537+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:11:50.358+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ 62d1f98f-62f9-4962-9210-c0a9f0b2104f
+
+
+ admin
+
+
+ 2013-06-14T17:11:54.981+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:12:03.272+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ d8ccb8e3-ffa9-4c1a-b29f-11f150a593e9
+
+
+ admin
+
+
+ 2013-06-14T17:12:17.867+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:12:32.388+02:00
+
+
+ superuser
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ f23c100d-c9d5-4a47-9d01-e87a337b8d9f
+
+
+ admin
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 0aae9134-3691-48e4-908f-f053760a77ff
+
+
+ admin
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ d2860914-9682-4154-9114-a5b91a25667b
+
+
+ admin
+
+
+ 2013-05-17T09:14:44.978+02:00
+
+
+ superuser
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ fd62cec8-3fcb-43b7-8a07-869358b865ec
+
+
+ /modules/security-app/apps/security/subApps/users/actionbar/sections/deletedUser/groups/activationActions
+
+
+ admin
+
+
+ false
+
+
+ 2012-06-11T15:11:28.694+02:00
+
+
+ 2013-06-16T17:16:26.549+02:00
+
+
+ superuser
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 7f0ed22e-698d-4b8a-8870-2fa15229ebf3
+
+
+ /modules/security-app/apps/security/subApps/users/actionbar/sections/deletedUser/groups/versionActions
+
+
+ admin
+
+
+ false
+
+
+ 2012-06-11T15:11:28.694+02:00
+
+
+ 2013-06-16T17:18:30.970+02:00
+
+
+ superuser
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 8df9b6d2-0eb5-4447-981f-8abb1e9fbb3d
+
+
+ admin
+
+
+ 2013-05-16T14:35:52.537+02:00
+
+
+ superuser
+
+
+ 2013-06-16T17:10:21.548+02:00
+
+
+ superuser
+
+
+ info.magnolia.ui.api.availability.IsDeletedRule
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 61a8f836-85fc-4b2a-9a0e-1adc54ba25a4
+
+
+ admin
+
+
+ mgnl:group
+
+
+ 2013-04-26T17:17:17.148+02:00
+
+
+ 2013-05-17T09:15:55.174+02:00
+
+
+ superuser
+
+
+
+
mgnl:contentNode
@@ -2940,11 +4224,14 @@
mix:lockable
- 1b1cdee3-a18f-44fe-bb55-d5eeccc7879c
+ 3b4fd922-2b79-4d08-ae54-a51db7eb6ada
- info.magnolia.ui.framework.action.DeleteItemActionDefinition
+ info.magnolia.ui.framework.action.MarkNodeAsDeletedActionDefinition
+
+ markAsDeleted
+
icon-delete
@@ -2954,7 +4241,39 @@
Delete role
+
+ 2013-06-16T17:30:27.924+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ def267f9-9d53-4990-8b56-9c3e81310097
+
+
+ admin
+
+
+ 2013-06-16T17:12:22.799+02:00
+
+
+ superuser
+
+
+ 2013-06-16T17:13:41.966+02:00
+
+
+ superuser
+
+
+ info.magnolia.ui.api.availability.IsNotDeletedRule
+
-
+
+
mgnl:contentNode
@@ -2977,7 +4296,33 @@
Edit role
+
+
+ mgnl:contentNode
+
+
+ 8cf344b9-1d6f-414d-bcc1-c0c4ff10bf4f
+
+
+ admin
+
+
+ 2013-06-16T17:12:22.799+02:00
+
+
+ superuser
+
+
+ 2013-06-16T17:23:35.641+02:00
+
+
+ superuser
+
+
+ info.magnolia.ui.api.availability.IsNotDeletedRule
+
-
+
+
mgnl:contentNode
@@ -3091,7 +4436,59 @@
superuser
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 84563d09-2cd2-4acd-a993-b837147ec952
+
+
+ /modules/security-app/apps/security/subApps/users/actions/activateDeleted
+
+
+ admin
+
+
+ 2013-02-25T12:38:03.268+01:00
+
+
+ 2013-06-16T17:20:49.469+02:00
+
+
+ superuser
+
-
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 07771fa6-542c-4ef6-a73f-0bffecdf1f93
+
+
+ /modules/security-app/apps/security/subApps/users/actions/restorePreviousVersion
+
+
+ admin
+
+
+ 2013-02-25T12:38:03.268+01:00
+
+
+ 2013-06-16T17:21:04.554+02:00
+
+
+ superuser
+
+
+
mgnl:contentNode
@@ -3529,7 +4926,7 @@
-
+
mgnl:contentNode
@@ -3543,10 +4940,10 @@
admin
- Role
+ Deleted role
- 2013-05-17T09:28:25.380+02:00
+ 2013-06-16T17:25:17.854+02:00
superuser
@@ -3692,6 +5089,270 @@
c51f07e7-545d-432c-ba77-b1885913488e
+ /modules/security-app/apps/security/subApps/users/actionbar/sections/deletedUser/groups/activationActions
+
+
+ admin
+
+
+ false
+
+
+ 2012-06-11T15:11:28.694+02:00
+
+
+ 2013-06-16T17:25:39.457+02:00
+
+
+ superuser
+
+
+
+
+ mgnl:contentNode
+
+
+ 1ecf7b09-a277-4b17-ad74-f5378608b9a0
+
+
+ /modules/security-app/apps/security/subApps/users/actionbar/sections/deletedUser/groups/versionActions
+
+
+ admin
+
+
+ 2013-06-16T17:26:00.956+02:00
+
+
+ superuser
+
+
+ 2013-06-16T17:26:08.013+02:00
+
+
+ superuser
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 38b13847-70ab-4d53-9ca0-1e57cc19c330
+
+
+ admin
+
+
+ 2013-05-16T14:35:52.537+02:00
+
+
+ superuser
+
+
+ 2013-06-16T17:29:25.012+02:00
+
+
+ superuser
+
+
+ info.magnolia.ui.api.availability.IsDeletedRule
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ affb9ac1-09f0-422d-8098-4982a1e0cf38
+
+
+ admin
+
+
+ mgnl:role
+
+
+ 2013-04-26T17:17:17.148+02:00
+
+
+ 2013-05-17T09:28:16.948+02:00
+
+
+ superuser
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 8b3bc0d8-8c01-4945-bef0-3e6b5d60316e
+
+
+ admin
+
+
+ Role
+
+
+ 2013-06-16T17:24:16.439+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ fdae3118-57c9-4a2a-808f-921f4abf3bab
+
+
+ admin
+
+
+
+ mgnl:contentNode
+
+
+ 21554a90-d2da-4c26-a67f-f18762194fd6
+
+
+ admin
+
+
+ 2013-06-14T17:11:32.537+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:15:14.675+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ fc8efd9a-db01-48f9-acac-d4218cf1675e
+
+
+ admin
+
+
+ 2013-06-14T17:11:54.981+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:12:03.272+02:00
+
+
+ superuser
+
+
+
+ mgnl:contentNode
+
+
+ 8f3a862a-cb5f-4a54-be67-c8ca60a9c16e
+
+
+ admin
+
+
+ 2013-06-14T17:12:17.867+02:00
+
+
+ superuser
+
+
+ 2013-06-14T17:15:31.959+02:00
+
+
+ superuser
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 0936f012-4b48-4462-91a5-dce84e2b1dff
+
+
+ admin
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ db092b53-c85e-4ba3-b120-4c478233ed30
+
+
+ admin
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ 18c83258-c640-43a7-9c73-f24298a3c0a3
+
+
+ admin
+
+
+ 2013-05-17T09:27:37.806+02:00
+
+
+ superuser
+
+
+
+
+
+
+ mgnl:contentNode
+
+
+ mix:lockable
+
+
+ bee12c10-adbc-4c43-b19e-3ac94a68899a
+
+
/modules/security-app/apps/security/subApps/users/actionbar/sections/user/groups/activationActions
@@ -3719,7 +5380,7 @@
mix:lockable
- 38b13847-70ab-4d53-9ca0-1e57cc19c330
+ 9a9e4ee0-c811-4002-878c-ca20fbb219d1
admin
@@ -3744,7 +5405,7 @@
mix:lockable
- affb9ac1-09f0-422d-8098-4982a1e0cf38
+ 72b92f93-869b-4985-8098-86c11b6d27c7
admin