diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj index f3b8d567a..3031cbf75 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj @@ -112,8 +112,8 @@ - - + + @@ -136,6 +136,9 @@ + + + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Roles/RoleEventHandler.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Roles/RoleEventHandler.cs index 49d040998..eb32cbe05 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Roles/RoleEventHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Roles/RoleEventHandler.cs @@ -57,7 +57,6 @@ namespace Orchard.AuditTrail.Providers.Roles { RecordAuditTrailEvent(eventName, roleName, properties: null, eventData: eventData); } - private void RecordAuditTrailEvent(string eventName, string roleName, IUser user) { var properties = new Dictionary { diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-RoleCreated.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-Created.cshtml similarity index 78% rename from src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-RoleCreated.cshtml rename to src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-Created.cshtml index 29e31861f..f2abda990 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-RoleCreated.cshtml +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-Created.cshtml @@ -5,5 +5,5 @@ }
- @T("Created {0} role.", roleName) + @T("Created the role {0}.", roleName)
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-PermissionAdded.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-PermissionAdded.cshtml index 6d9b76ecc..acb13d1c4 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-PermissionAdded.cshtml +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-PermissionAdded.cshtml @@ -6,5 +6,5 @@ }
- @T("Added the {0} permission to the {1} role.", permissionName, roleName) + @T("Added the permission {0} to the role {1}.", permissionName, roleName)
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-PermissionRemoved.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-PermissionRemoved.cshtml index ffbc0bc40..bf43ccd8e 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-PermissionRemoved.cshtml +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-PermissionRemoved.cshtml @@ -6,5 +6,5 @@ }
- @T("Removed the {0} permission from the {1} role.", permissionName, roleName) + @T("Removed the permission {0} from the role {1}.", permissionName, roleName)
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-Removed.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-Removed.cshtml new file mode 100644 index 000000000..b3f07fd6d --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-Removed.cshtml @@ -0,0 +1,9 @@ +@using Orchard.AuditTrail.Helpers +@{ + var eventData = (IDictionary) Model.EventData; + var roleName = eventData.Get("RoleName"); +} + +
+ @T("Removed the role {0}.", roleName) +
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-RoleRenamed.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-Renamed.cshtml similarity index 73% rename from src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-RoleRenamed.cshtml rename to src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-Renamed.cshtml index 769eabd6f..6f9802335 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-RoleRenamed.cshtml +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-Renamed.cshtml @@ -6,5 +6,5 @@ }
- @T("Renamed {0} to {1}.", previousRoleName, newRoleName) + @T("Renamed the role {0} to {1}.", previousRoleName, newRoleName)
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-UserAdded.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-UserAdded.cshtml new file mode 100644 index 000000000..182c49f47 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-UserAdded.cshtml @@ -0,0 +1,10 @@ +@using Orchard.AuditTrail.Helpers +@{ + var eventData = (IDictionary) Model.EventData; + var roleName = eventData.Get("RoleName"); + var userName = eventData.Get("UserName"); +} + +
+ @T("Added the user {0} to the role {1}.", userName, roleName) +
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-UserRemoved.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-UserRemoved.cshtml new file mode 100644 index 000000000..cc5004b83 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Role-UserRemoved.cshtml @@ -0,0 +1,10 @@ +@using Orchard.AuditTrail.Helpers +@{ + var eventData = (IDictionary)Model.EventData; + var roleName = eventData.Get("RoleName"); + var userName = eventData.Get("UserName"); +} + +
+ @T("Removed the user {0} from the role {1}.", userName, roleName) +
\ No newline at end of file