JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 14:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app into production

Browse Source
This commit is contained in:
StudioTem committed 2023-09-27 15:18:14 +02:00
2 parents 31d0a2d198 f55d62dacf
commit 3c5ec91398
4 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/.env
+1 -1
View File
@@ -1 +1 @@
VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/api/ VUE_APP_WAXIOS_URL=http://127.0.0.1:8001/api/
app/.env.production
+1 -1
View File
@@ -1 +1 @@
VUE_APP_WAXIOS_URL=https://tm.jandl.sk/api/ VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/api/
be/app/Mail/NewTask.php
+1 -1
View File
@@ -28,7 +28,7 @@ class NewTask extends Mailable
{ {
$creator = \App\Models\User::find($subtask->created_by); $creator = \App\Models\User::find($subtask->created_by);
$usersInMasterTask = $subtask->mastertask->allUsersInMasterTask(); $usersInMasterTask = $subtask->mastertask->allUsersInMasterTask;
$this->creator = $creator; $this->creator = $creator;
$this->subtask = $subtask; $this->subtask = $subtask;
be/app/Mail/SubTaskDeleted.php
+1 -1
View File
@@ -38,7 +38,7 @@ class SubTaskDeleted extends Mailable
public function envelope() public function envelope()
{ {
return new Envelope( return new Envelope(
subject: 'Bol vytvorený Sub Task ' . $this->subtask->mastertask->project->code . ' - ' . ($this->subtask->title) ?: $this->subtask->mastertask->title, subject: 'Bol vymazaný Sub Task ' . $this->subtask->mastertask->project->code . ' - ' . ($this->subtask->title) ?: $this->subtask->mastertask->title,
); );
} }