Skip to content

Commit

Permalink
Merge pull request #2729 from Leantime/components-tracker-fixes
Browse files Browse the repository at this point in the history
update canvas dialog input fields + idea save fix
  • Loading branch information
marcelfolaron authored Oct 14, 2024
2 parents e88b754 + efdfae6 commit 07f8b94
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 38 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,13 @@ class="w-1/2"
<div class="col-md-3">
<x-global::forms.text-input type="number" step="0.01" name="startValue"
value="{{ $canvasItem['startValue'] }}" labelText="{{ __('label.starting_value') }}"
variant="compact"
class="w-5" />

</div>
<div class="col-md-3">
<x-global::forms.text-input type="number" step="0.01" name="currentValue"
id="currentValueField" value="{{ $canvasItem['currentValue'] }}"
labelText="{{ __('label.current_value') }}" variant="compact"
labelText="{{ __('label.current_value') }}"
class="w-5"

{{-- @if ($canvasItem['setting'] == 'linkAndReport')--}}
Expand All @@ -71,9 +70,7 @@ class="w-5"
<div class="col-md-3">
<x-global::forms.text-input type="number" step="0.01" name="endValue"
value="{{ $canvasItem['endValue'] }}" labelText="{{ __('label.goal_value') }}"

class="w-5"
variant="compact" />
class="w-5"/>

</div>
<div class="col-md-3">
Expand Down
5 changes: 3 additions & 2 deletions app/Domain/Ideas/Controllers/IdeaDialog.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@ public function post($params): Response
return Frontcontroller::redirect($result['redirect']);
}

$this->tpl->assign('canvasTypes', $result['canvasTypes']);
$this->tpl->assign('canvasItem', $result['canvasItem']);

$this->tpl->assign('canvasTypes', $result['canvasTypes']??'');
$this->tpl->assign('canvasItem', $result['canvasItem']??'');

$this->tpl->closeModal();
$this->tpl->htmxRefresh();
Expand Down
4 changes: 2 additions & 2 deletions app/Domain/Projects/Services/Projects.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public function notifyProjectUsers(Notification $notification): void
{

//Filter notifications
$notification = EventCore::dispatchFilter('notificationFilter', $notification);
$notification = self::dispatchFilter('notificationFilter', $notification);

//Email
$users = $this->getUsersToNotify($notification->projectId);
Expand Down Expand Up @@ -329,7 +329,7 @@ public function notifyProjectUsers(Notification $notification): void
);
}

EventCore::dispatchEvent('notifyProjectUsers', ['type' => 'projectUpdate', 'module' => $notification->module, 'moduleId' => $entityId, 'message' => $notification->message, 'subject' => $notification->subject, 'users' => $this->getAllUserInfoToNotify($notification->projectId), 'url' => $notification->url['url']], 'domain.services.projects');
self::dispatchEvent('notifyProjectUsers', ['type' => 'projectUpdate', 'module' => $notification->module, 'moduleId' => $entityId, 'message' => $notification->message, 'subject' => $notification->subject, 'users' => $this->getAllUserInfoToNotify($notification->projectId), 'url' => $notification->url['url']], 'domain.services.projects');
}

/**
Expand Down
55 changes: 26 additions & 29 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 07f8b94

Please sign in to comment.