mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 06:20:21 +00:00
Merge branch 'main' of https://bitbucket.org/studiotem/jandl-taskmanager-app
This commit is contained in:
commit
d06c2af76d
2 files changed
+35
-6
No files matched your search
@@ -13,9 +13,31 @@ Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/tasks?subtask=' .
|
|||||||
|
|
||||||
@php
|
@php
|
||||||
|
|
||||||
|
$description = ($subtask->description) ?: $subtask->mastertask->description;
|
||||||
|
|
||||||
|
// Define regular expressions for Windows and Mac SMB links
|
||||||
|
$pattern_windows = '/smb:\/\/serverjl[^ ]*/';
|
||||||
|
$pattern_mac = '/\\\\serverjl\\\\[^ ]*/';
|
||||||
|
|
||||||
|
// Define the callback function to replace links
|
||||||
|
function replace_smb_links($matches) {
|
||||||
|
$link = $matches[0];
|
||||||
|
if (strpos($link, 'smb://serverjl') === 0) {
|
||||||
|
// Windows link
|
||||||
|
$windows_link = str_replace('smb://serverjl', '\\\\serverjl\\', $link);
|
||||||
|
return "<br>Windows: $windows_link <br> Mac: $link <br>";
|
||||||
|
} elseif (strpos($link, '\\\\serverjl\\') === 0) {
|
||||||
|
// Mac link
|
||||||
|
$mac_link = str_replace('\\\\serverjl\\', 'smb://serverjl', $link);
|
||||||
|
return "<br>Windows: $link <br> Mac: $mac_link <br>";
|
||||||
|
}
|
||||||
|
return $link; // In case no pattern matches, return the original link
|
||||||
|
}
|
||||||
|
|
||||||
|
// Replace SMB links using the callback function
|
||||||
|
$description = preg_replace_callback($pattern_windows, 'replace_smb_links', $description);
|
||||||
|
$description = preg_replace_callback($pattern_mac, 'replace_smb_links', $description);
|
||||||
|
|
||||||
$test = 'testtesttest';
|
|
||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
Popis: {!!($subtask->description) ?: $subtask->mastertask->description !!} <br>
|
Popis: {!!$description!!} <br>
|
||||||
Popis2: {{$test}} <br>
|
|
||||||
+10
-3
@@ -1,7 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Http\Resources\TeamCollection;
|
use App\Mail\NewTask;
|
||||||
use App\Models\Team;
|
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -19,6 +18,15 @@ Route::get('/', function () {
|
|||||||
return view('welcome');
|
return view('welcome');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Route::get('/send-email', function () {
|
||||||
|
$subtask = \App\Models\SubTask::with('mastertask')->find(1622);
|
||||||
|
|
||||||
|
Mail::to('feher@studiotem.com')->send(new NewTask($subtask));
|
||||||
|
|
||||||
|
return 'Email has been sent';
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
Route::prefix('be')->group(function () {
|
Route::prefix('be')->group(function () {
|
||||||
Route::get('/unauthenticated', function () {
|
Route::get('/unauthenticated', function () {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
@@ -30,7 +38,6 @@ Route::prefix('be')->group(function () {
|
|||||||
$subtask = \App\Models\SubTask::with('mastertask')->find(1);
|
$subtask = \App\Models\SubTask::with('mastertask')->find(1);
|
||||||
|
|
||||||
dd($subtask);
|
dd($subtask);
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user