Skip to content

Released v7.3.2 #83

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

Merged
valadas merged 2 commits into from
Jun 12, 2025
Merged

Released v7.3.2 #83

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
e2dfc4c
Replace DnnDateTimePicker with <input type=datetime-local>
bdukes Jun 11, 2025
15772a6
Merge pull request #82 from bdukes/remove-dnndatepicker
valadas Jun 12, 2025
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
10 changes: 3 additions & 7 deletions src/AnnouncementsEdit.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
<%@ Control Language="C#" AutoEventWireup="false" CodeBehind="AnnouncementsEdit.ascx.cs"
Inherits="DotNetNuke.Modules.Announcements.AnnouncementsEdit" %>
<%@ Register Assembly="DotNetNuke" Namespace="DotNetNuke.UI.UserControls" TagPrefix="dnn" %>
<%@ Control Language="C#" AutoEventWireup="false" CodeBehind="AnnouncementsEdit.ascx.cs" Inherits="DotNetNuke.Modules.Announcements.AnnouncementsEdit" %>
<%@ Register TagPrefix="dnn" TagName="TextEditor" Src="~/controls/TextEditor.ascx" %>
<%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
<%@ Register TagPrefix="dnn" TagName="Tracking" Src="~/controls/URLTrackingControl.ascx" %>
<%@ Register TagPrefix="dnn" TagName="Audit" Src="~/controls/ModuleAuditControl.ascx" %>
<%@ Register TagPrefix="dnn" TagName="URL" Src="~/controls/URLControl.ascx" %>
<%@ Register TagPrefix="dnn" TagName="FilePickerUploader" Src="~/controls/filepickeruploader.ascx" %>
<%@ Import Namespace="DotNetNuke.Services.Localization" %>
<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.UI.WebControls" Assembly="DotNetNuke" %>
<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.UI.WebControls.Internal" Assembly="DotNetNuke.Web" %>
<div class="dnnForm dnnAnnouncementForm dnnClear" id="AnnouncementsForm">
<ul class="dnnAdminTabNav dnnClear" id="">
<li id="contentTab" runat="server"><a href="#dnnContent"><%=LocalizeString("content.Tab")%></a></li>
Expand Down Expand Up @@ -67,11 +63,11 @@
</div>
<div class="dnnFormItem">
<dnn:Label ID="plPublishDate" Suffix=":" ControlName="publishDate" runat="server" />
<div class="dateDiv"><dnn:DnnDateTimePicker ID="publishDate" runat="server" /></div>
<div class="dateDiv"><asp:TextBox ID="publishDate" type="datetime-local" runat="server" /></div>
</div>
<div class="dnnFormItem">
<dnn:Label ID="plExpireDate" Suffix=":" ControlName="expireDate" runat="server" />
<div class="dateDiv"><dnn:DnnDateTimePicker ID="expireDate" runat="server" /></div>
<div class="dateDiv"><asp:TextBox ID="expireDate" type="datetime-local" runat="server" /></div>
</div>
</fieldset>
</div>
Expand Down
28 changes: 8 additions & 20 deletions src/AnnouncementsEdit.ascx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,20 @@
using System;
using System.Data.SqlTypes;
using System.Globalization;

using System.Web.UI.WebControls;
using DotNetNuke.Common;
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities.Portals;
using DotNetNuke.Entities.Users;
using DotNetNuke.Framework;
using DotNetNuke.Framework.JavaScriptLibraries;
using DotNetNuke.Modules.Announcements.Components.Business;
using DotNetNuke.Modules.Announcements.Components.Common;
using DotNetNuke.Modules.Announcements.MVP.Models;
using DotNetNuke.Modules.Announcements.MVP.Presenters;
using DotNetNuke.Modules.Announcements.MVP.Views;
using DotNetNuke.Services.Exceptions;
using DotNetNuke.Services.Localization;
using DotNetNuke.Web.Client;
using DotNetNuke.Web.Client.ClientResourceManagement;
using DotNetNuke.Web.Mvp;
using DotNetNuke.Web.UI.WebControls.Internal;
using WebFormsMvp;

#endregion
Expand Down Expand Up @@ -206,13 +202,13 @@ private void BindForm()
(Model.AnnouncementInfo.PublishDate != (DateTime)SqlDateTime.Null))
{
var portalDateTime = TimeZoneInfo.ConvertTimeFromUtc(Model.AnnouncementInfo.PublishDate.Value, ModuleContext.PortalSettings.TimeZone);
publishDate.SelectedDate = portalDateTime;
publishDate.Text = portalDateTime.ToString("yyyy-MM-dd'T'HH:mm", CultureInfo.InvariantCulture);
}
if ((!Null.IsNull(Model.AnnouncementInfo.ExpireDate)) &&
(Model.AnnouncementInfo.ExpireDate != (DateTime)SqlDateTime.Null))
{
var portalDateTime = TimeZoneInfo.ConvertTimeFromUtc(Model.AnnouncementInfo.ExpireDate.Value, ModuleContext.PortalSettings.TimeZone);
expireDate.SelectedDate = portalDateTime;
expireDate.Text = portalDateTime.ToString("yyyy-MM-dd'T'HH:mm", CultureInfo.InvariantCulture);
}

var user = UserController.Instance.GetCurrentUserInfo();
Expand Down Expand Up @@ -280,13 +276,13 @@ private string ReturnURL
}
}

private DateTime? GetDateTimeValue(DnnDatePicker dnnDatePicker)
private DateTime? GetDateTimeValue(TextBox datePicker)
{
DateTime? resultValue = null;

if (dnnDatePicker.SelectedDate != null)
if (DateTime.TryParseExact(datePicker.Text, ["yyyy-MM-dd'T'HH:mm", "yyyy-MM-dd"], CultureInfo.InvariantCulture, DateTimeStyles.None, out var selectedDate))
{
resultValue = dnnDatePicker.SelectedDate;
resultValue = selectedDate;
}

if (resultValue.HasValue)
Expand All @@ -297,19 +293,11 @@ private string ReturnURL
return null;
}

private DateTime? GetDateTimeValue(DnnDateTimePicker dnnDatePicker, DateTime defaultValue)
private DateTime? GetDateTimeValue(TextBox datePicker, DateTime defaultValue)
{
DateTime? resultValue = GetDateTimeValue(dnnDatePicker);

if (!resultValue.HasValue)
{
resultValue = defaultValue;
}

return resultValue;
return GetDateTimeValue(datePicker) ?? defaultValue;
}


}

}
Loading