Merge branch 'ent-8659-mostrar-nombre-completo-del-usuario-para-el-owner-de-un-evento' into 'develop'
Ent 8659 mostrar nombre completo del usuario para el owner de un evento See merge request artica/pandorafms!5114
This commit is contained in:
commit
5047f8afb9
|
@ -2078,7 +2078,7 @@ function events_change_owner(
|
||||||
events_comment(
|
events_comment(
|
||||||
$id_event,
|
$id_event,
|
||||||
'',
|
'',
|
||||||
'Change owner to '.$new_owner
|
'Change owner to '.get_user_fullname($new_owner).' ('.$new_owner.')'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3284,18 +3284,9 @@ function events_page_responses($event)
|
||||||
|
|
||||||
foreach ($users as $u) {
|
foreach ($users as $u) {
|
||||||
$owners[$u['id_user']] = $u['id_user'];
|
$owners[$u['id_user']] = $u['id_user'];
|
||||||
|
if (empty($u['fullname']) === false) {
|
||||||
|
$owners[$u['id_user']] = $u['fullname'].' ('.$u['id_user'].')';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($event['owner_user']) === true) {
|
|
||||||
$owner_name = __('None');
|
|
||||||
} else {
|
|
||||||
$owner_name = db_get_value(
|
|
||||||
'id_user',
|
|
||||||
'tusuario',
|
|
||||||
'id_user',
|
|
||||||
$event['owner_user']
|
|
||||||
);
|
|
||||||
$owners[$event['owner_user']] = $owner_name;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$data[1] = html_print_select(
|
$data[1] = html_print_select(
|
||||||
|
@ -4904,7 +4895,7 @@ function events_page_comments($event, $ajax=false, $groupedComments=[])
|
||||||
'<b>%s %s %s%s</b>',
|
'<b>%s %s %s%s</b>',
|
||||||
$c['action'],
|
$c['action'],
|
||||||
__('by'),
|
__('by'),
|
||||||
$c['id_user'],
|
get_user_fullname($c['id_user']).' ('.$c['id_user'].')',
|
||||||
$eventIdExplanation
|
$eventIdExplanation
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -466,9 +466,12 @@ function event_change_status(event_ids, server_id) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.status == "status_ok") {
|
if (data.status == "status_ok") {
|
||||||
if (typeof dt_events !== "undefined") {
|
// if (typeof dt_events !== "undefined") {
|
||||||
dt_events.draw(false);
|
// dt_events.draw(false);
|
||||||
}
|
// }
|
||||||
|
$("#table_events")
|
||||||
|
.DataTable()
|
||||||
|
.draw(false);
|
||||||
$("#notification_status_success").show();
|
$("#notification_status_success").show();
|
||||||
if (new_status == 1) {
|
if (new_status == 1) {
|
||||||
$("#extended_event_general_page table td.general_acknowleded").text(
|
$("#extended_event_general_page table td.general_acknowleded").text(
|
||||||
|
@ -526,9 +529,12 @@ function event_change_owner(event_id, server_id) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data == "owner_ok") {
|
if (data == "owner_ok") {
|
||||||
if (typeof dt_events !== "undefined") {
|
// if (typeof dt_events !== "undefined") {
|
||||||
dt_events.draw(false);
|
// dt_events.draw(false);
|
||||||
}
|
// }
|
||||||
|
$("#table_events")
|
||||||
|
.DataTable()
|
||||||
|
.draw(false);
|
||||||
$("#notification_owner_success").show();
|
$("#notification_owner_success").show();
|
||||||
if (new_owner == -1) {
|
if (new_owner == -1) {
|
||||||
$("#extended_event_general_page table td.general_owner").html(
|
$("#extended_event_general_page table td.general_owner").html(
|
||||||
|
|
|
@ -220,7 +220,7 @@ table.table_modal_alternate tr td {
|
||||||
}
|
}
|
||||||
|
|
||||||
table.table_modal_alternate tr td:first-child {
|
table.table_modal_alternate tr td:first-child {
|
||||||
width: 35%;
|
width: 50%;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
padding-left: 20px;
|
padding-left: 20px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -741,6 +741,8 @@ if (is_ajax() === true) {
|
||||||
// Owner.
|
// Owner.
|
||||||
if (empty($tmp->owner_user) === true) {
|
if (empty($tmp->owner_user) === true) {
|
||||||
$tmp->owner_user = __('System');
|
$tmp->owner_user = __('System');
|
||||||
|
} else {
|
||||||
|
$tmp->owner_user = get_user_fullname($tmp->owner_user).' ('.$tmp->owner_user.')';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Group name.
|
// Group name.
|
||||||
|
|
Loading…
Reference in New Issue