Merge branch 'develop' of https://github.com/frappe/frappe into custom_append_to

This commit is contained in:
Himanshu Warekar 2020-03-27 13:18:02 +05:30
commit 2374e4da14
3 changed files with 14 additions and 2 deletions

View file

@ -161,6 +161,10 @@ $.extend(frappe.model, {
user_default = frappe.boot.user.last_selected_values[df.options];
}
if (!user_default && default_doc) {
user_default = default_doc;
}
var is_allowed_user_default = user_default &&
(!has_user_permissions || allowed_records.includes(user_default));

View file

@ -28,4 +28,12 @@
}
.page-card p {
font-size: 14px;
}
}
.ellipsis {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
max-width: 100%;
vertical-align: middle;
}

View file

@ -24,7 +24,7 @@ html, body {
<span class='indicator {{ indicator_color or "blue" }}'>
{{ title or _("Message") }}</span>
</h5>
<div class="page-card-body">
<div class="page-card-body ellipsis">
{% block message_body %}
<p>{{ message or "" }}</p>
{% if primary_action %}