Skip to content

Upgrade solution with DNN 9.11 and Telerik removal #130

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade solution with DNN 9.11 and Telerik removal #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5f31b1
Upgrade solution with DNN 9.11 (minimal security requirement)
stetard Aug 4, 2024
9ffcc1b
Replace DnnDateTimePicker with html DateTime inputs for Telerik removal.
stetard Aug 5, 2024
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 Deploy/Deploy.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>Deploy2</RootNamespace>
</PropertyGroup>

Expand Down
11 changes: 5 additions & 6 deletions R7.Documents.Dnn/EditDocuments.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="false" CodeBehind="EditDocuments.ascx.cs" Inherits="R7.Documents.EditDocuments" %>
<%@ Control Language="C#" AutoEventWireup="false" CodeBehind="EditDocuments.ascx.cs" Inherits="R7.Documents.EditDocuments" %>
<%@ Register TagPrefix="dnn" TagName="URL" Src="~/controls/DnnUrlControl.ascx" %>
<%@ Register TagPrefix="dnn" TagName="Audit" Src="~/controls/ModuleAuditControl.ascx" %>
<%@ Register TagPrefix="dnn" TagName="Tracking" Src="~/controls/URLTrackingControl.ascx" %>
<%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.UI.WebControls" Assembly="DotNetNuke.Web.Deprecated" %>
<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.Client.ClientResourceManagement" Assembly="DotNetNuke.Web.Client" %>

<dnn:DnnCssInclude runat="server" FilePath="~/DesktopModules/R7.Documents/R7.Documents.Dnn/assets/css/admin.css" Priority="200" />
Expand Down Expand Up @@ -42,11 +41,11 @@
</div>
<div class="dnnFormItem control-group-start">
<dnn:Label id="lblStartDate" runat="server" ControlName="dtStartDate" />
<dnn:DnnDateTimePicker id="dtStartDate" runat="server" />
<asp:TextBox id="dtStartDate" type="datetime-local" runat="server" />
</div>
<div class="dnnFormItem">
<dnn:Label id="lblEndDate" runat="server" ControlName="dtEndDate" />
<dnn:DnnDateTimePicker id="dtEndDate" runat="server" />
<asp:TextBox id="dtEndDate" type="datetime-local" runat="server" />
</div>
</fieldset>
</div>
Expand All @@ -63,11 +62,11 @@
</div>
<div class="dnnFormItem control-group-start" >
<dnn:Label id="lblCreatedDate" runat="server" ControlName="dtCreatedDate" />
<dnn:DnnDateTimePicker id="dtCreatedDate" runat="server" />
<asp:TextBox id="dtCreatedDate" type="datetime-local" runat="server" />
</div>
<div class="dnnFormItem control-group-end">
<dnn:Label id="lblLastModifiedDate" runat="server" ControlName="dtLastModifiedDate" />
<dnn:DnnDateTimePicker id="dtLastModifiedDate" runat="server" />
<asp:TextBox id="dtLastModifiedDate" type="datetime-local" runat="server" />
</div>
<div class="dnnFormItem">
<dnn:Label id="lblLinkAttributes" runat="server" ControlName="txtLinkAttributes" />
Expand Down
10 changes: 5 additions & 5 deletions R7.Documents.Dnn/EditDocuments.ascx.controls.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Web.UI.WebControls;
using System.Web.UI.WebControls;
using DotNetNuke.UI.UserControls;
using DotNetNuke.Web.UI.WebControls;

Expand Down Expand Up @@ -27,10 +27,10 @@ public partial class EditDocuments
protected RangeValidator valSortIndex;
protected LinkButton btnChangeOwner;
protected URLTrackingControl ctlUrlTracking;
protected DnnDateTimePicker dtCreatedDate;
protected DnnDateTimePicker dtLastModifiedDate;
protected DnnDateTimePicker dtStartDate;
protected DnnDateTimePicker dtEndDate;
protected TextBox dtCreatedDate;
protected TextBox dtLastModifiedDate;
protected TextBox dtStartDate;
protected TextBox dtEndDate;
protected MultiView mvEditDocument;
protected LinkButton btnEdit;
protected HyperLink lnkClose;
Expand Down
42 changes: 30 additions & 12 deletions R7.Documents.Dnn/EditDocuments.ascx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections;
using System.IO;
using System.Linq;
Expand Down Expand Up @@ -26,6 +26,9 @@
using R7.Dnn.Extensions.Text;
using R7.Dnn.Extensions.FileSystem;
using R7.University.Components;
using System.Globalization;
using System.Text.RegularExpressions;
using System.Web.Services.Description;

namespace R7.Documents
{
Expand Down Expand Up @@ -305,12 +308,12 @@ void LoadExistingDocument (IDocument document)
txtTitle.Text = document.Title;
txtDescription.Text = document.Description;
chkForceDownload.Checked = document.ForceDownload;
dtStartDate.SelectedDate = document.StartDate;
dtEndDate.SelectedDate = document.EndDate;
dtStartDate.Text = document.StartDate?.ToString("yyyy-MM-ddTHH:mm");
dtEndDate.Text = document.EndDate?.ToString("yyyy-MM-ddTHH:mm");
txtLinkAttributes.Text = document.LinkAttributes;
chkIsFeatured.Checked = document.IsFeatured;
dtCreatedDate.SelectedDate = document.CreatedDate;
dtLastModifiedDate.SelectedDate = document.ModifiedDate;
dtCreatedDate.Text = document.CreatedDate.ToString("yyyy-MM-ddTHH:mm");
dtLastModifiedDate.Text = document.ModifiedDate.ToString("yyyy-MM-ddTHH:mm");
txtSortIndex.Text = document.SortOrderIndex.ToString ();

if (!string.IsNullOrEmpty (document.Url)) {
Expand Down Expand Up @@ -644,19 +647,34 @@ void UpdateDateTime (DocumentInfo document, DocumentInfo oldDocument)
{
var now = DateTime.Now;

document.StartDate = dtStartDate.SelectedDate;
document.EndDate = dtEndDate.SelectedDate;
DateTime dateResult;
if (DateTime.TryParse(dtStartDate.Text.Replace("-", "/"), CultureInfo.CurrentCulture, DateTimeStyles.AssumeLocal, out dateResult))
{
document.StartDate = dateResult;
}
else
{
document.StartDate = null;
}
if (DateTime.TryParse(dtEndDate.Text.Replace("-", "/"), CultureInfo.CurrentCulture, DateTimeStyles.AssumeLocal, out dateResult))
{
document.EndDate = dateResult;
}
else
{
document.EndDate = null;
}

if (dtCreatedDate.SelectedDate == null) {
document.CreatedDate = now;
if (DateTime.TryParse(dtCreatedDate.Text.Replace("-", "/"), CultureInfo.CurrentCulture, DateTimeStyles.AssumeLocal, out dateResult)) {
document.CreatedDate = dateResult;
} else {
document.CreatedDate = dtCreatedDate.SelectedDate.Value;
document.CreatedDate = now;
}

if (dtLastModifiedDate.SelectedDate == null || oldDocument.Url != ctlUrl.Url) {
if (!DateTime.TryParse(dtLastModifiedDate.Text.Replace("-", "/"), CultureInfo.CurrentCulture, DateTimeStyles.AssumeLocal, out dateResult) || oldDocument.Url != ctlUrl.Url) {
document.ModifiedDate = now;
} else {
document.ModifiedDate = dtLastModifiedDate.SelectedDate.Value;
document.ModifiedDate = dateResult;
}
}

Expand Down
Loading