Skip to content

Commit 1605afd

Browse files
ryancooleyryancooley
authored
Merge pull request #7531 from ProcessMaker/feature/FOUR-19522
feature/FOUR-19522 file manager option on the Case Detail
2 parents a101a66 + f51f5ec commit 1605afd

38 files changed

Lines changed: 155 additions & 86 deletions

‎ProcessMaker/Http/Controllers/Api/ProcessController.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ public function index(Request $request)
149149
if ($request->input('simplified_data_for_selector', false)) {
150150
$fields = $this->getRequestFields($request);
151151
$processes = $processes->select($fields);
152+
152153
return new ApiCollection($processes->get());
153154
}
154155

@@ -483,8 +484,8 @@ public function update(Request $request, Process $process)
483484
if ($request->has('manager_id')) {
484485
$process->manager_id = $request->input('manager_id', null);
485486
}
486-
487-
if($request->has('reassignment_users')) {
487+
488+
if ($request->has('reassignment_users')) {
488489
$process->setProperty('reassignment_users', $request->get('reassignment_users'));
489490
}
490491

@@ -510,8 +511,8 @@ public function update(Request $request, Process $process)
510511

511512
// Save default language for anon web entry...
512513
if ($request->has(['default_for_anon_webentry', 'language_code'])) {
513-
$process->default_anon_web_language = $request->input('default_for_anon_webentry')
514-
? $request->input('language_code')
514+
$process->default_anon_web_language = $request->input('default_for_anon_webentry')
515+
? $request->input('language_code')
515516
: null;
516517
}
517518

‎ProcessMaker/Http/Controllers/Api/ProcessRequestController.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -880,4 +880,25 @@ public function getRequestsByCase(Request $request, User $user = null)
880880

881881
return new ApiCollection($response);
882882
}
883+
884+
/**
885+
* This endpoint returns the parent request by case number
886+
*
887+
* @param Request $request
888+
*
889+
* @return ApiCollection
890+
*/
891+
public function getParentRequestByCase(Request $request)
892+
{
893+
// Validate the inputs, including optional ones
894+
$request->validate([
895+
'case_number' => 'required|integer',
896+
]);
897+
898+
$response = ProcessRequest::where('case_number', $request->input('case_number'))
899+
->whereNull('parent_request_id')
900+
->first();
901+
902+
return new ApiResource($response);
903+
}
883904
}

‎ProcessMaker/Http/Controllers/Api/TaskDraftController.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
use ProcessMaker\Http\Resources\ApiCollection;
99
use ProcessMaker\Http\Resources\ApiResource;
1010
use ProcessMaker\Models\ProcessRequestToken;
11-
use ProcessMaker\SanitizeHelper;
1211
use ProcessMaker\Models\TaskDraft;
12+
use ProcessMaker\SanitizeHelper;
1313

1414
class TaskDraftController extends Controller
1515
{
@@ -20,6 +20,7 @@ public function index(Request $request, ProcessRequestToken $task)
2020

2121
if ($draft) {
2222
$draftData = $draft->data;
23+
2324
return new ApiResource($draftData);
2425
}
2526

@@ -33,12 +34,13 @@ public function update(Request $request, ProcessRequestToken $task)
3334
// Do not overwrite __deleted_files
3435
$deletedFiles = Arr::get($draft->data, '__deleted_files');
3536
$data = json_decode($request->getContent(), true);
36-
$data = SanitizeHelper::sanitizeData( $data, null, $task->processRequest->do_not_sanitize ?? []);
37+
$data = SanitizeHelper::sanitizeData($data, null, $task->processRequest->do_not_sanitize ?? []);
3738
if ($deletedFiles) {
3839
$data['__deleted_files'] = $deletedFiles;
3940
}
4041
$draft->data = $data;
4142
$draft->saveOrFail();
43+
4244
return new ApiResource($draft);
4345
}
4446

‎ProcessMaker/Http/Controllers/Auth/LoginController.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ public function beforeLogout(Request $request)
266266
Cookie::queue(Cookie::forget(Passport::cookie()));
267267

268268
// process any redirects generated by the logout event listeners
269-
foreach($eventResult as $result) {
269+
foreach ($eventResult as $result) {
270270
if (is_array($result) && array_key_exists('redirectTo', $result)) {
271271
return redirect($result['redirectTo']);
272272
}
@@ -352,7 +352,7 @@ public function login(Request $request, User $user)
352352
});
353353

354354
$this->setupLanguage($request, $user);
355-
355+
356356
return $this->sendLoginResponse($request);
357357
}
358358

@@ -381,7 +381,8 @@ public function showLoginFailed(Request $request)
381381
return view('errors.login-failed');
382382
}
383383

384-
private function setupLanguage(Request $request, User $user) {
384+
private function setupLanguage(Request $request, User $user)
385+
{
385386
$language = $request->cookies->get('language');
386387
if ($language) {
387388
$user->language = json_decode($language)->code;

‎ProcessMaker/Managers/ScreenCompiledManager.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public function createKey(string $processId, string $processVersionId, string $l
9292
public function getLastScreenVersionId()
9393
{
9494
$row = DB::select('SELECT id FROM screen_versions ORDER BY id DESC LIMIT 1;');
95+
9596
return $row[0]->id;
9697
}
9798

‎ProcessMaker/Models/ProcessRequestToken.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@ public function reassign($toUserId, User $requestingUser)
12171217
// Validate if user can reassign
12181218
Gate::forUser($requestingUser)->authorize('reassign', $this);
12191219
// Reassign user
1220-
$this->is_self_service = 0; //When reassigning the user, it is not necessary to claim the task.
1220+
$this->is_self_service = 0; //When reassigning the user, it is not necessary to claim the task.
12211221
$this->reassignTo($toUserId);
12221222
$this->persistUserData($toUserId);
12231223
$reassingAction = true;

‎ProcessMaker/ProcessTranslations/MenuTranslation.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public function apply()
1818
{
1919
$language = $this->getTargetLanguage();
2020
$translations = $this->getTranslations($language);
21+
2122
return $this->applyTranslations($translations);
2223
}
23-
2424

2525
private function getTranslations($language)
2626
{
@@ -60,4 +60,4 @@ private function updateLinkText(&$links, $key, $translation)
6060
}
6161
}
6262
}
63-
}
63+
}

‎ProcessMaker/ProcessTranslations/TranslationManager.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Illuminate\Support\Facades\Auth;
66
use Illuminate\Support\Facades\Cache;
77
use ProcessMaker\Package\Translations\Models\Language;
8+
use ProcessMaker\Package\Translations\Models\Translatable;
89

910
class TranslationManager
1011
{

‎ProcessMaker/Providers/ProcessMakerServiceProvider.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace ProcessMaker\Providers;
44

5+
use Illuminate\Database\Console\Migrations\MigrateCommand;
56
use Illuminate\Database\Eloquent\Factories\Factory;
67
use Illuminate\Filesystem\Filesystem;
78
use Illuminate\Foundation\PackageManifest;
@@ -14,7 +15,6 @@
1415
use Laravel\Horizon\Horizon;
1516
use Laravel\Passport\Passport;
1617
use Lavary\Menu\Menu;
17-
use Illuminate\Database\Console\Migrations\MigrateCommand;
1818
use ProcessMaker\Console\Migration\ExtendedMigrateCommand;
1919
use ProcessMaker\Events\ActivityAssigned;
2020
use ProcessMaker\Events\ScreenBuilderStarting;

‎ProcessMaker/Repositories/CaseApiRepository.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function search(Request $request, Builder $query): void
159159
}
160160

161161
// Add a plus (+) to the beginning and an asterisk (*) to the end of each word
162-
$search = preg_replace_callback("/\b[\w']+\b/u", function($matches) {
162+
$search = preg_replace_callback("/\b[\w']+\b/u", function ($matches) {
163163
return '+' . $matches[0] . '*';
164164
}, $search);
165165

0 commit comments

Comments
 (0)