Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #5297 from sbwalker/dev

Browse Source 
adding time zone support to admin modules
This commit is contained in:
Shaun Walker
2025-05-13 13:55:15 -04:00
committed by GitHub
parent 49c62f80e8 deb4607081
commit 8ffa7ef7ff
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Files/Index.razor
View File

@ -53,7 +53,7 @@ else
<td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" ResourceKey="Details" /></td> <td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" ResourceKey="Details" /></td>
<td><ActionDialog Header="Delete File" Message="@string.Format(Localizer["Confirm.File.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" ResourceKey="DeleteFile" /></td> <td><ActionDialog Header="Delete File" Message="@string.Format(Localizer["Confirm.File.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" ResourceKey="DeleteFile" /></td>
<td><a href="@context.Url" target="_new">@context.Name</a></td> <td><a href="@context.Url" target="_new">@context.Name</a></td>
<td>@context.ModifiedOn</td> <td>@UtcToLocal(context.ModifiedOn)</td>
<td>@context.Extension.ToUpper() @SharedLocalizer["File"]</td> <td>@context.Extension.ToUpper() @SharedLocalizer["File"]</td>
<td>@string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB</td> <td>@string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB</td>
</Row> </Row>

4
Oqtane.Client/Modules/Admin/Jobs/Log.razor
View File

@ -23,8 +23,8 @@ else
<Row> <Row>
<td>@context.Job.Name</td> <td>@context.Job.Name</td>
<td>@DisplayStatus(context.Job.IsExecuting, context.Succeeded)</td> <td>@DisplayStatus(context.Job.IsExecuting, context.Succeeded)</td>
<td>@context.StartDate</td> <td>@UtcToLocal(context.StartDate)</td>
<td>@context.FinishDate</td> <td>@UtcToLocal(context.FinishDate)</td>
</Row> </Row>
<Detail> <Detail>
<td colspan="4">@((MarkupString)context.Notes)</td> <td colspan="4">@((MarkupString)context.Notes)</td>

2
Oqtane.Client/Modules/Admin/Logs/Detail.razor
View File

@ -141,7 +141,7 @@
var log = await LogService.GetLogAsync(_logId); var log = await LogService.GetLogAsync(_logId);
if (log != null) if (log != null)
{ {
_logDate = log.LogDate.ToString(CultureInfo.CurrentCulture); _logDate = UtcToLocal(log.LogDate).Value.ToString(CultureInfo.CurrentCulture);
_level = log.Level; _level = log.Level;
_feature = log.Feature; _feature = log.Feature;
_function = log.Function; _function = log.Function;

2
Oqtane.Client/Modules/Admin/Logs/Index.razor
View File

@ -64,7 +64,7 @@ else
</Header> </Header>
<Row> <Row>
<td class="@GetClass(context.Function)"><ActionLink Action="Detail" Text="Details" Parameters="@($"/{context.LogId}")" ReturnUrl="@(NavigateUrl(PageState.Page.Path, AddUrlParameters(_level, _function, _rows, _page)))" ResourceKey="LogDetails" /></td> <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Text="Details" Parameters="@($"/{context.LogId}")" ReturnUrl="@(NavigateUrl(PageState.Page.Path, AddUrlParameters(_level, _function, _rows, _page)))" ResourceKey="LogDetails" /></td>
<td class="@GetClass(context.Function)">@context.LogDate</td> <td class="@GetClass(context.Function)">@UtcToLocal(context.LogDate)</td>
<td class="@GetClass(context.Function)">@context.Level</td> <td class="@GetClass(context.Function)">@context.Level</td>
<td class="@GetClass(context.Function)">@context.Feature</td> <td class="@GetClass(context.Function)">@context.Feature</td>
<td class="@GetClass(context.Function)">@context.Function</td> <td class="@GetClass(context.Function)">@context.Function</td>

2
Oqtane.Client/Modules/Admin/UrlMappings/Index.razor
View File

@ -48,7 +48,7 @@ else
} }
</td> </td>
<td>@context.Requests</td> <td>@context.Requests</td>
<td>@context.RequestedOn</td> <td>@UtcToLocal(context.RequestedOn)</td>
</Row> </Row>
</Pager> </Pager>
</TabPanel> </TabPanel>

2
Oqtane.Client/Modules/Admin/Users/Edit.razor
View File

@ -207,7 +207,7 @@
_displayname = user.DisplayName; _displayname = user.DisplayName;
_timezoneid = PageState.User.TimeZoneId; _timezoneid = PageState.User.TimeZoneId;
_isdeleted = user.IsDeleted.ToString(); _isdeleted = user.IsDeleted.ToString();
_lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", user.LastLoginOn); _lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", UtcToLocal(user.LastLoginOn));
_lastipaddress = user.LastIPAddress; _lastipaddress = user.LastIPAddress;
_ishost = UserSecurity.ContainsRole(user.Roles, RoleNames.Host); _ishost = UserSecurity.ContainsRole(user.Roles, RoleNames.Host);

2
Oqtane.Client/Modules/Admin/Users/Index.razor
View File

@ -43,7 +43,7 @@ else
<td>@context.User.Username</td> <td>@context.User.Username</td>
<td>@context.User.DisplayName</td> <td>@context.User.DisplayName</td>
<td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{1}</a>", @context.User.Email, @context.User.Email))</td> <td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{1}</a>", @context.User.Email, @context.User.Email))</td>
<td>@((context.User.LastLoginOn != DateTime.MinValue) ? string.Format("{0:dd-MMM-yyyy HH:mm:ss}", context.User.LastLoginOn) : "")</td> <td>@((context.User.LastLoginOn != DateTime.MinValue) ? string.Format("{0:dd-MMM-yyyy HH:mm:ss}", UtcToLocal(context.User.LastLoginOn)) : "")</td>
</Row> </Row>
</Pager> </Pager>
</TabPanel> </TabPanel>

4
Oqtane.Client/Modules/Admin/Visitors/Detail.razor
View File

@ -101,8 +101,8 @@
_url = visitor.Url; _url = visitor.Url;
_referrer = visitor.Referrer; _referrer = visitor.Referrer;
_visits = visitor.Visits.ToString(); _visits = visitor.Visits.ToString();
_visited = visitor.VisitedOn.ToString(CultureInfo.CurrentCulture); _visited = UtcToLocal(visitor.VisitedOn).Value.ToString(CultureInfo.CurrentCulture);
_created = visitor.CreatedOn.ToString(CultureInfo.CurrentCulture); _created = UtcToLocal(visitor.CreatedOn).Value.ToString(CultureInfo.CurrentCulture);
if (visitor.UserId != null) if (visitor.UserId != null)
{ {

4
Oqtane.Client/Modules/Admin/Visitors/Index.razor
View File

@ -53,8 +53,8 @@ else
</td> </td>
<td>@context.Language</td> <td>@context.Language</td>
<td>@context.Visits</td> <td>@context.Visits</td>
<td>@context.VisitedOn</td> <td>@UtcToLocal(context.VisitedOn)</td>
<td>@context.CreatedOn</td> <td>@UtcToLocal(context.CreatedOn)</td>
</Row> </Row>
</Pager> </Pager>
</TabPanel> </TabPanel>

6
Oqtane.Client/Modules/Controls/AuditInfo.razor
View File

@ -52,7 +52,7 @@
if (CreatedOn != null) if (CreatedOn != null)
{ {
_text += $" {Localizer["On"]} <b>{CreatedOn.Value.ToString(DateTimeFormat)}</b>"; _text += $" {Localizer["On"]} <b>{UtcToLocal(CreatedOn).Value.ToString(DateTimeFormat)}</ b >";
} }
_text += "</p>"; _text += "</p>";
@ -69,7 +69,7 @@
if (ModifiedOn != null) if (ModifiedOn != null)
{ {
_text += $" {Localizer["On"]} <b>{ModifiedOn.Value.ToString(DateTimeFormat)}</b>"; _text += $" {Localizer["On"]} <b>{UtcToLocal(ModifiedOn).Value.ToString(DateTimeFormat)}</ b >";
} }
_text += "</p>"; _text += "</p>";
@ -86,7 +86,7 @@
if (DeletedOn != null) if (DeletedOn != null)
{ {
_text += $" {Localizer["On"]} <b>{DeletedOn.Value.ToString(DateTimeFormat)}</b>"; _text += $" {Localizer["On"]} <b>{UtcToLocal(DeletedOn).Value.ToString(DateTimeFormat)}</ b >";
} }
_text += "</p>"; _text += "</p>";