CaptainCore/captaincore-manager
1
0
Fork 0
mirror of https://gh.llkk.cc/https://github.com/CaptainCore/captaincore-manager.git synced 2025-10-03 14:04:44 +08:00
Code Issues Packages Activity Actions

🐛 FIX: Processes with roles

Browse source
This commit is contained in:
Austin Ginder 2020-02-04 09:27:49 -05:00
parent 4709091804
commit f0fc1bcf60
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/Process.php
View file

@ -26,6 +26,11 @@ class Process {
"time_estimate" => $process->time_estimate, "time_estimate" => $process->time_estimate,


]; ];
if ( $process->roles == "" ) {
$fetch_process['roles'] = "";
} else {
$fetch_process['roles'] = $process_roles[$key]->name;
}
return $fetch_process; return $fetch_process;
} }



6
app/Processes.php
View file

@ -30,7 +30,11 @@ class Processes extends DB {
$process = self::get( $item->process_id ); $process = self::get( $item->process_id );
$key = array_search( $process->roles, array_column( $process_roles, 'role_id' ) ); $key = array_search( $process->roles, array_column( $process_roles, 'role_id' ) );
$process->repeat_interval = $process_repeat->{$process->repeat_interval}; $process->repeat_interval = $process_repeat->{$process->repeat_interval};
$process->roles = $process_roles[$key]->name; if ( $process->roles == "" ) {
$process->roles = "";
} else {
$process->roles = $process_roles[$key]->name;
}
$processes[] = $process; $processes[] = $process;
} }
return $processes; return $processes;

4
templates/core.php
View file

@ -847,7 +847,7 @@ if ( $role_check ) {
<v-btn icon @click.native="dialog_handbook.show = false"> <v-btn icon @click.native="dialog_handbook.show = false">
<v-icon>close</v-icon> <v-icon>close</v-icon>
</v-btn> </v-btn>
<v-toolbar-title>{{ dialog_handbook.process.name }} <v-chip color="primary" text-color="white" text>{{ dialog_handbook.process.roles }}</v-chip></v-toolbar-title> <v-toolbar-title>{{ dialog_handbook.process.name }} <v-chip color="primary" text-color="white" text v-show="dialog_handbook.process.roles != ''">{{ dialog_handbook.process.roles }}</v-chip></v-toolbar-title>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-toolbar-items> <v-toolbar-items>
<v-btn text @click="editProcess()">Edit</v-btn> <v-btn text @click="editProcess()">Edit</v-btn>
@ -3616,7 +3616,7 @@ if ( $role_check ) {
<v-card :hover="true" @click="viewProcess( process.process_id )"> <v-card :hover="true" @click="viewProcess( process.process_id )">
<v-card-title primary-title class="pt-2"> <v-card-title primary-title class="pt-2">
<div> <div>
<span class="title">{{ process.name }}</a> <v-chip color="primary" text-color="white" text>{{ process.roles }}</v-chip></span> <span class="title">{{ process.name }}</a> <v-chip color="primary" text-color="white" text v-show="process.roles != ''">{{ process.roles }}</v-chip></span>
<div class="caption"> <div class="caption">
<v-icon v-show="process.time_estimate != ''" style="padding:0px 5px">mdi-clock-outline</v-icon>{{ process.time_estimate }} <v-icon v-show="process.time_estimate != ''" style="padding:0px 5px">mdi-clock-outline</v-icon>{{ process.time_estimate }}
<v-icon v-show="process.repeat_interval != '' && process.repeat_interval != null" style="padding:0px 5px">mdi-calendar-repeat</v-icon>{{ process.repeat_interval }} <v-icon v-show="process.repeat_interval != '' && process.repeat_interval != null" style="padding:0px 5px">mdi-calendar-repeat</v-icon>{{ process.repeat_interval }}