Skip to content

Commit 42f7c39

Browse files
authored
Merge pull request #8406 from ProcessMaker/bugfix/FOUR-25547
FOUR-25547: Process Owner field editable.
2 parents ffae4dd + 21df4b4 commit 42f7c39

File tree

4 files changed

+22
-0
lines changed

4 files changed

+22
-0
lines changed

ProcessMaker/Http/Controllers/Api/ProcessController.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,10 @@ public function update(Request $request, Process $process)
531531
$process->manager_id = $request->input('manager_id', null);
532532
}
533533

534+
if ($request->has('user_id')) {
535+
$process->user_id = $request->input('user_id', null);
536+
}
537+
534538
if ($request->has('reassignment_permissions')) {
535539
$process->setProperty('reassignment_permissions', $request->get('reassignment_permissions'));
536540
}

resources/lang/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,6 +1599,7 @@
15991599
"Process Launchpad": "Process Launchpad",
16001600
"Process Manager not configured.": "Process Manager not configured.",
16011601
"Process Manager": "Process Manager",
1602+
"Process Owner": "Process Owner",
16021603
"Process Name": "Process Name",
16031604
"Process was successfully imported": "Process was successfully imported",
16041605
"Process_category_id": "Process Category ID",

resources/lang/es.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,6 +1557,7 @@
15571557
"Process Launchpad": "Lanzador de Procesos",
15581558
"Process Manager not configured.": "El administrador de procesos no está configurado.",
15591559
"Process Manager": "Administrador de procesos",
1560+
"Process Owner": "Propietario del proceso",
15601561
"Process Name": "Nombre del Proceso",
15611562
"Process was successfully imported": "El proceso fue importado exitosamente",
15621563
"Process_category_id": "ID de Categoría de Proceso",

resources/views/processes/edit.blade.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,20 @@ class="invalid-feedback"
164164
</div>
165165
</b-col>
166166
<b-col>
167+
<label class="typo__label">{{__('Process Owner')}}</label>
168+
<select-user
169+
data-cy="process-owner"
170+
v-model="owner"
171+
:multiple="false"
172+
:class="{'is-invalid': errors.user_id}"
173+
/>
174+
<div
175+
v-if="errors.user_id"
176+
class="invalid-feedback"
177+
role="alert"
178+
>
179+
@{{errors.user_id[0]}}
180+
</div>
167181
</b-col>
168182
</b-row>
169183
</div>
@@ -536,6 +550,7 @@ class="custom-control-input">
536550
activeUsersAndGroups: @json($list),
537551
pause_timer_start_events: false,
538552
manager: @json($process->manager),
553+
owner: @json($process->user),
539554
activeTab: "",
540555
noElementsFoundMsg: 'Oops! No elements found. Consider changing the search query.',
541556
reassignmentPermissions: {
@@ -651,6 +666,7 @@ class="custom-control-input">
651666
this.formData.cancel_screen_id = this.formatValueScreen(this.screenCancel);
652667
this.formData.request_detail_screen_id = this.formatValueScreen(this.screenRequestDetail);
653668
this.formData.manager_id = this.formatValueScreen(this.manager);
669+
this.formData.user_id = this.formatValueScreen(this.owner);
654670
this.formData.reassignment_permissions = this.reassignmentPermissions;
655671
656672
ProcessMaker.apiClient.put('processes/' + that.formData.id, that.formData)

0 commit comments

Comments
 (0)