Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions ProcessMaker/Http/Controllers/Api/ProcessController.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use ProcessMaker\Http\Controllers\Api\GroupController;
use ProcessMaker\Http\Controllers\Api\TemplateController;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Requests\ProcessUpdateRequest;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Http\Resources\ApiResource;
use ProcessMaker\Http\Resources\Process as Resource;
Expand Down Expand Up @@ -463,7 +464,7 @@ public function store(Request $request)
/**
* Updates the current element.
*
* @param Request $request
* @param ProcessUpdateRequest $request
* @param Process $process
* @return ResponseFactory|Response
*
Expand Down Expand Up @@ -494,21 +495,13 @@ public function store(Request $request)
* ),
* )
*/
public function update(Request $request, Process $process)
public function update(ProcessUpdateRequest $request, Process $process)
{
$lastVersion = $process->getDraftOrPublishedLatestVersion();
$process->bpmn = $lastVersion->bpmn;
$process->alternative = $lastVersion->alternative;
$process->stages = $lastVersion->stages;

$rules = Process::rules($process);
if (!$request->has('name')) {
unset($rules['name']);
}
if ($request->has('default_for_anon_webentry')) {
$rules = ['language_code' => 'required_if:default_for_anon_webentry,true'];
}
$request->validate($rules);
$original = $process->getOriginal();

// Replace html entities with the correct characters
Expand Down
55 changes: 55 additions & 0 deletions ProcessMaker/Http/Requests/ProcessUpdateRequest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php

namespace ProcessMaker\Http\Requests;

use Illuminate\Foundation\Http\FormRequest;
use ProcessMaker\Models\Process;

class ProcessUpdateRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}

/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
$process = $this->route('process');
$rules = Process::rules($process);

if (!$this->has('name')) {
unset($rules['name']);
}

if ($this->has('default_for_anon_webentry')) {
$rules = ['language_code' => 'required_if:default_for_anon_webentry,true'];
}

if ($this->has('user_id')) {
$rules['user_id'] = ['required', 'integer', 'exists:users,id'];
}

return $rules;
}

/**
* Get the validation messages that apply to the request.
*
* @return array<string, string>
*/
public function messages(): array
{
return [
'user_id.required' => __('Process owner is required.'),
'user_id.exists' => __('Selected process owner is invalid.'),
];
}
}
11 changes: 9 additions & 2 deletions resources/views/processes/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -688,8 +688,15 @@ class="custom-control-input">
.catch(error => {
//define how display errors
if (error.response.status && error.response.status === 422) {
// Validation error
that.errors = error.response.data.errors;
// Validation error
that.errors = error.response.data.errors;
const errors = that.errors || {};
const firstFieldErrors = Object.values(errors).find(fieldErrors => Array.isArray(fieldErrors) && fieldErrors.length);
const firstError = (firstFieldErrors && firstFieldErrors[0]) || error.response.data.message;

if (firstError) {
window.ProcessMaker.alert(that.$t(firstError), 'danger');
}
}
});
},
Expand Down
Loading