Fix Jalali year-0 crash on /tasks from invalid target_date.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -246,12 +246,12 @@ if (isset($task)) {
|
||||
|
||||
// اگر مقدار اولیه از دیتابیس آمده، فیلد مخفی میلادی را هم پر کن
|
||||
@if(!empty($task?->start_date))
|
||||
$('#start_date_gregorian').val(@json(\Carbon\Carbon::parse($task->start_date)->format('Y-m-d')));
|
||||
$('#start_date').val(@json(\Morilog\Jalali\Jalalian::fromCarbon(\Carbon\Carbon::parse($task->start_date))->format('Y/m/d')));
|
||||
$('#start_date_gregorian').val(@json(\App\Support\JalaliHelper::toGregorianDate($task->start_date)));
|
||||
$('#start_date').val(@json(\App\Support\JalaliHelper::format($task->start_date, 'Y/m/d', '')));
|
||||
@endif
|
||||
@if(!empty($task?->target_date))
|
||||
$('#target_date_gregorian').val(@json(\Carbon\Carbon::parse($task->target_date)->format('Y-m-d')));
|
||||
$('#target_date').val(@json(\Morilog\Jalali\Jalalian::fromCarbon(\Carbon\Carbon::parse($task->target_date))->format('Y/m/d')));
|
||||
$('#target_date_gregorian').val(@json(\App\Support\JalaliHelper::toGregorianDate($task->target_date)));
|
||||
$('#target_date').val(@json(\App\Support\JalaliHelper::format($task->target_date, 'Y/m/d', '')));
|
||||
@endif
|
||||
|
||||
$('form').on('submit', function (e) {
|
||||
|
||||
@@ -584,10 +584,10 @@ $state = [
|
||||
<article class="task-card task-row {{ $task->active ? 'is-active' : '' }}"
|
||||
data-task-id="{{ $task->id }}"
|
||||
data-assignee-ids='@json($task->assignee_ids ?? [])'
|
||||
data-start-date="{{ $task->start_date ? \Carbon\Carbon::parse($task->start_date)->format('Y-m-d') : '' }}"
|
||||
data-target-date="{{ $task->target_date ? \Carbon\Carbon::parse($task->target_date)->format('Y-m-d') : '' }}"
|
||||
data-finished-date="{{ $task->finished_at ? \Carbon\Carbon::parse($task->finished_at)->format('Y-m-d') : '' }}"
|
||||
data-created-date="{{ $task->created_at ? \Carbon\Carbon::parse($task->created_at)->format('Y-m-d') : '' }}"
|
||||
data-start-date="{{ \App\Support\JalaliHelper::toGregorianDate($task->start_date) }}"
|
||||
data-target-date="{{ \App\Support\JalaliHelper::toGregorianDate($task->target_date) }}"
|
||||
data-finished-date="{{ \App\Support\JalaliHelper::toGregorianDate($task->finished_at) }}"
|
||||
data-created-date="{{ \App\Support\JalaliHelper::toGregorianDate($task->created_at) }}"
|
||||
onclick="openTaskDetailsModal({{ $task->id }})"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
@@ -626,7 +626,7 @@ $state = [
|
||||
@else
|
||||
<div class="task-card-field">
|
||||
<dt class="task-card-label">مهلت</dt>
|
||||
<dd class="task-card-value">{{ $task->target_date ? Jalalian::fromCarbon(Carbon::parse($task->target_date))->format('Y/m/d') : '-' }}</dd>
|
||||
<dd class="task-card-value">{{ \App\Support\JalaliHelper::format($task->target_date) }}</dd>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user