Skip to content

Commit

Permalink
Messages: Contact List text adjustments.
Browse files Browse the repository at this point in the history
  • Loading branch information
Nate committed Mar 29, 2019
1 parent f280969 commit 418eeb8
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions app/messages/messages_contacts.php
View file
Expand Up @@ -178,8 +178,9 @@
//contact name/number
if ($contact[$number]['contact_name_given'] != '' || $contact[$number]['contact_name_family'] != '') {
echo "<div style='float: right; margin-top: 8px; margin-right: ".($selected ? '-1' : '4')."px;' title=\"".$text['label-view_contact']."\"><a href='/app/contacts/contact_edit.php?id=".$contact[$number]['contact_uuid']."' target='_blank'><i class='glyphicon glyphicon-user'></i></a></div>\n";
echo "<strong style='display: inline-block; margin: 8px 0 5px 0;'>".escape($contact[$number]['contact_name_given'].' '.$contact[$number]['contact_name_family']).'</strong><br>';
echo "<span style='font-size: 80%; white-space: nowrap;'><a href='callto:".escape($number)."'><i class='glyphicon glyphicon-phone' style='margin-right: 5px;'></i>".escape(format_phone($number)).'</a></span><br>';
echo "<div style='display: table;'>\n";
echo " <strong style='display: inline-block; margin: 8px 0 5px 0; white-space: nowrap;'>".escape($contact[$number]['contact_name_given'].' '.$contact[$number]['contact_name_family']).'</strong><br>';
echo " <span style='font-size: 80%; white-space: nowrap;'><a href='callto:".escape($number)."'><i class='glyphicon glyphicon-phone' style='margin-right: 5px;'></i>".escape(format_phone($number)).'</a></span><br>';
if (valid_email($contact[$number]['contact_email'])) {
echo "<span style='font-size: 80%; white-space: nowrap;'><a href='mailto:".escape($contact[$number]['contact_email'])."'><i class='glyphicon glyphicon-envelope' style='margin-right: 5px;'></i>".$text['label-send_email']."</a></span><br>";
}
Expand All @@ -188,6 +189,7 @@
$contact_html = (permission_exists('contact_view') ? "<a href='".PROJECT_PATH."/app/contacts/contact_edit.php?id=".$contact[$number]['contact_uuid']."' target='_blank'>".$contact_name."</a>" : $contact_name)." : <a href='callto:".escape($number)."'>".escape(format_phone($number))."</a>";
echo "<script>$('#contact_current_name').html(\"".$contact_html."\");</script>\n";
}
echo "</div>\n";
}
else {
echo escape(format_phone($number));
Expand Down

2 comments on commit 418eeb8

@pacomms
Copy link

@pacomms pacomms commented on 418eeb8 Apr 1, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, i have an issue since updating messages app, every time i update and run sql test i get the following
ALTER TABLE v_messages ALTER COLUMN message_date TYPE timestamptz;
It says this every time so it must not be changing it, Confirmed on 3 different installs.

Thanks

@fusionate
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just committed an update to the Schema class that should do away with the message. The field type in the database does actually get changed to timestsamptz (when you run Upgrade Schema with Data Type checked), but the class simply wasn't recognizing that the type had already been changed.

Please Upgrade the Source Code, then run Upgrade Schema again to verify the message is no longer displayed. You can also scroll down to the v_messages table (in the output displayed below), and you'll be able to verify that the field type for message_date is indeed timestamptz (as shown in the attached screenshot).

capture_20190402_110123

Please sign in to comment.