Skip to content
Merged
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
6 changes: 1 addition & 5 deletions enferno/admin/models/Actor.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,7 @@ def verlabels(self):

@staticmethod
def gen_full_name(first_name: str, last_name: str, middle_name: Optional[str] = None) -> str:
name = first_name
if middle_name:
name = name + " " + middle_name
name = name + " " + last_name
return name
return " ".join(part for part in (first_name, middle_name, last_name) if part)

# populate actor object from json dict
def from_json(self, json: dict[str, Any]) -> "Actor":
Expand Down
4 changes: 4 additions & 0 deletions enferno/admin/templates/admin/actors.html
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,10 @@

<template v-if="fetchingRecordsError" v-slot:no-data></template>

<template v-slot:item.name="{item}">
${ (item.name || '').trim() || item.name_ar }
</template>

<template v-slot:item.type="{item}">
<v-tooltip :text="item.type">
<template v-slot:activator="{props}">
Expand Down
Loading