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

Kaboom - now the View Audit Trial Context menu item & its dialog is gone. As you can see this on the content node under info

Browse Source
This commit is contained in:
Warren
2018-08-02 09:55:48 +01:00
parent e33498fb56
commit 3fadfaf632
10 changed files with 1 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -390,7 +390,6 @@
<Content Include="Umbraco\Dialogs\rollBack.aspx" />
<Content Include="Umbraco\Dialogs\sendToTranslation.aspx" />
<Content Include="Umbraco\Dialogs\treePicker.aspx" />
<Content Include="Umbraco\Dialogs\viewAuditTrail.aspx" />
<Content Include="Umbraco\Config\Create\UI.xml" />
<Content Include="Umbraco\Config\Lang\en.xml">
<SubType>Designer</SubType>

73
src/Umbraco.Web.UI/Umbraco/dialogs/viewAuditTrail.aspx
View File

@@ -1,73 +0,0 @@
<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoPage.Master"Codebehind="viewAuditTrail.aspx.cs" AutoEventWireup="True"
Inherits="umbraco.presentation.umbraco.dialogs.viewAuditTrail" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
<style type="text/css">
.gridHeader{border-bottom:2px solid #D9D7D7;}
.gridItem{border-color: #D9D7D7;}
html, body {overflow: initial;}
</style>
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
<cc1:Pane runat="server">
<div id="auditTrailList">
<asp:DataGrid ID="auditLog" runat="server" BorderStyle="None" HeaderStyle-CssClass="gridHeader" ItemStyle-CssClass="gridItem" GridLines="Horizontal" HeaderStyle-Font-Bold="True" AutoGenerateColumns="False"
width="100%">
<Columns>
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=Services.TextService.Localize("action")%>&nbsp;&nbsp;
</b>
</HeaderTemplate>
<ItemTemplate>
<%# FormatAction(DataBinder.Eval(Container.DataItem, "LogType", "{0}")) %>
</ItemTemplate>
</asp:TemplateColumn>
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=Services.TextService.Localize("user")%>
</b>
</HeaderTemplate>
<ItemTemplate>
<%--TODO: N+1 !!!!!!!!!!!!--%>
<%# Services.UserService.GetUserById(int.Parse(DataBinder.Eval(Container.DataItem, "UserId", "{0}"))).Name%>
</ItemTemplate>
</asp:TemplateColumn>
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=Services.TextService.Localize("date")%>
</b>
</HeaderTemplate>
<ItemTemplate>
<%# DataBinder.Eval(Container.DataItem, "Timestamp", "{0:D} {0:T}") %>
</ItemTemplate>
</asp:TemplateColumn>
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=Services.TextService.Localize("comment")%>
</b>
</HeaderTemplate>
<ItemTemplate>
<%# DataBinder.Eval(Container.DataItem, "Comment", "{0}") %>
</ItemTemplate>
</asp:TemplateColumn>
</Columns>
</asp:DataGrid>
</div>
</cc1:Pane>
</asp:Content>

8
src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
View File

@@ -301,13 +301,7 @@ Umbraco.Application.Actions = function() {
UmbClientMgr.openModalWindow("dialogs/importDocumentType.aspx?rnd=" + this._utils.generateRandom(), uiKeys['actions_importDocumentType'], true, 460, 400);
}
},
actionAudit: function() {
/// <summary></summary>
UmbClientMgr.openModalWindow('dialogs/viewAuditTrail.aspx?nodeId=' + UmbClientMgr.mainTree().getActionNode().nodeId + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_auditTrail'], true, 550, 500);
},
actionPackage: function() {
/// <summary></summary>
},

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

@@ -231,7 +231,6 @@ namespace Umbraco.Web.Trees
AddActionNode<ActionSort>(item, menu, true, true);
AddActionNode<ActionRollback>(item, menu, convert: true);
AddActionNode<ActionAudit>(item, menu, convert: true);
AddActionNode<ActionToPublish>(item, menu, convert: true);
AddActionNode<ActionAssignDomain>(item, menu, convert: true);
AddActionNode<ActionRights>(item, menu, convert: true);

5
src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
View File

@@ -273,11 +273,6 @@ namespace Umbraco.Web.Trees
new LegacyUrlAction(
"dialogs/importDocumentType.aspx",
Current.Services.TextService.Localize("actions/importDocumentType")));
case "UmbClientMgr.appActions().actionAudit()":
return Attempt.Succeed(
new LegacyUrlAction(
"dialogs/viewAuditTrail.aspx?nodeId=" + nodeId + "&rnd=" + DateTime.UtcNow.Ticks,
Current.Services.TextService.Localize("actions/auditTrail")));
}
return Attempt<LegacyUrlAction>.Fail();

11
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -461,7 +461,6 @@
<Compile Include="Editors\NuCacheStatusController.cs" />
<Compile Include="_Legacy\Actions\Action.cs" />
<Compile Include="_Legacy\Actions\ActionAssignDomain.cs" />
<Compile Include="_Legacy\Actions\ActionAudit.cs" />
<Compile Include="_Legacy\Actions\ActionBrowse.cs" />
<Compile Include="_Legacy\Actions\ActionChangeDocType.cs" />
<Compile Include="_Legacy\Actions\ActionCollection.cs" />
@@ -1318,13 +1317,6 @@
<Compile Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx.designer.cs">
<DependentUpon>sendToTranslation.aspx</DependentUpon>
</Compile>
<Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.cs">
<DependentUpon>viewAuditTrail.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx.designer.cs">
<DependentUpon>viewAuditTrail.aspx</DependentUpon>
</Compile>
<Compile Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx.cs">
<DependentUpon>DictionaryItemList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1493,9 +1485,6 @@
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx" />
<Content Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx">
<SubType>ASPXCodeBehind</SubType>
</Content>
</ItemGroup>
<ItemGroup>
<None Include="Web References\org.umbraco.update\checkforupgrade.disco" />

75
src/Umbraco.Web/_Legacy/Actions/ActionAudit.cs
View File

@@ -1,75 +0,0 @@
using System;
using Umbraco.Core;
using Umbraco.Core.CodeAnnotations;
using Umbraco.Web.UI.Pages;
namespace Umbraco.Web._Legacy.Actions
{
/// <summary>
/// This action is invoked upon viewing audittrailing on a document
/// </summary>
[ActionMetadata(Constants.Conventions.PermissionCategories.AdministrationCategory)]
public class ActionAudit : IAction
{
public static ActionAudit Instance { get; } = new ActionAudit();
#region IAction Members
public char Letter
{
get
{
return 'Z';
}
}
public string JsFunctionName
{
get
{
return string.Format("{0}.actionAudit()", ClientTools.Scripts.GetAppActions);
}
}
public string JsSource
{
get
{
return null;
}
}
public string Alias
{
get
{
return "auditTrail";
}
}
public string Icon
{
get
{
return "time";
}
}
public bool ShowInNotifier
{
get
{
return false;
}
}
public bool CanBePermissionAssigned
{
get
{
return true;
}
}
#endregion
}
}

72
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx
View File

@@ -1,72 +0,0 @@
<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoPage.Master"Codebehind="viewAuditTrail.aspx.cs" AutoEventWireup="True"
Inherits="umbraco.presentation.umbraco.dialogs.viewAuditTrail" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
<style type="text/css">
.gridHeader{border-bottom:2px solid #D9D7D7;}
.gridItem{border-color: #D9D7D7;}
html, body {overflow: initial;}
</style>
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
<cc1:Pane runat="server">
<div id="auditTrailList">
<asp:DataGrid ID="auditLog" runat="server" BorderStyle="None" HeaderStyle-CssClass="gridHeader" ItemStyle-CssClass="gridItem" GridLines="Horizontal" HeaderStyle-Font-Bold="True" AutoGenerateColumns="False"
width="100%">
<Columns>
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=Services.TextService.Localize("action")%>&nbsp;&nbsp;
</b>
</HeaderTemplate>
<ItemTemplate>
<%# FormatAction(DataBinder.Eval(Container.DataItem, "LogType", "{0}")) %>
</ItemTemplate>
</asp:TemplateColumn>
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=Services.TextService.Localize("user")%>
</b>
</HeaderTemplate>
<ItemTemplate>
<%--TODO: N+1 !!!! and no null checks--%>
<%# Services.UserService.GetUserById(int.Parse(DataBinder.Eval(Container.DataItem, "UserId", "{0}"))).Name%>
</ItemTemplate>
</asp:TemplateColumn>
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=Services.TextService.Localize("date")%>
</b>
</HeaderTemplate>
<ItemTemplate>
<%# DataBinder.Eval(Container.DataItem, "Timestamp", "{0:D} {0:T}") %>
</ItemTemplate>
</asp:TemplateColumn>
<asp:TemplateColumn>
<HeaderTemplate>
<b>
<%=Services.TextService.Localize("comment")%>
</b>
</HeaderTemplate>
<ItemTemplate>
<%# DataBinder.Eval(Container.DataItem, "Comment", "{0}") %>
</ItemTemplate>
</asp:TemplateColumn>
</Columns>
</asp:DataGrid>
</div>
</cc1:Pane>
</asp:Content>

74
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs
View File

@@ -1,74 +0,0 @@
using System;
using System.Collections;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Web;
using System.Web.SessionState;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.UI.HtmlControls;
using Umbraco.Core;
using Umbraco.Core.Services;
using Umbraco.Web;
using Umbraco.Web.Composing;
using Umbraco.Web._Legacy.Actions;
using Action = Umbraco.Web._Legacy.Actions.Action;
namespace umbraco.presentation.umbraco.dialogs
{
/// <summary>
/// Summary description for viewAuditTrail.
/// </summary>
public partial class viewAuditTrail : Umbraco.Web.UI.Pages.UmbracoEnsuredPage
{
public viewAuditTrail()
{
CurrentApp = Constants.Applications.Content.ToString();
}
protected void Page_Load(object sender, System.EventArgs e)
{
// Put user code to initialize the page here
//nodeName.Text = new cms.businesslogic.CMSNode(int.Parse(helper.Request("nodeID"))).Text;
auditLog.DataSource = Services.AuditService.GetLogs(int.Parse(Request["nodeID"]));
auditLog.DataBind();
auditLog.BorderWidth = 0;
auditLog.BorderStyle = BorderStyle.None;
}
public string FormatAction(string action)
{
action = action.ToLower();
if (action == "new")
action = "create";
var actions = Current.Actions;
foreach (var a in actions)
{
return Services.TextService.Localize(action);
}
return action;
}
#region Web Form Designer generated code
override protected void OnInit(EventArgs e)
{
//
// CODEGEN: This call is required by the ASP.NET Web Form Designer.
//
InitializeComponent();
base.OnInit(e);
}
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
}
#endregion
}
}

24
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.designer.cs generated
View File

@@ -1,24 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.umbraco.dialogs {
public partial class viewAuditTrail {
/// <summary>
/// auditLog control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DataGrid auditLog;
}
}