Pārlūkot izejas kodu

Merge pull request #13822 from resilient-tech/fix-inbox

fix: multiple issues with Email Inbox
version-14
mergify[bot] pirms 3 gadiem
committed by GitHub
vecāks
revīzija
257b41dcee
Šim parakstam datu bāzē netika atrasta zināma atslēga GPG atslēgas ID: 4AEE18F83AFDEB23
2 mainītis faili ar 12 papildinājumiem un 6 dzēšanām
  1. +6
    -1
      frappe/public/js/frappe/ui/toolbar/awesome_bar.js
  2. +6
    -5
      frappe/public/js/frappe/views/inbox/inbox_view.js

+ 6
- 1
frappe/public/js/frappe/ui/toolbar/awesome_bar.js Parādīt failu

@@ -194,9 +194,14 @@ frappe.search.AwesomeBar = class AwesomeBar {
var out = [], routes = [];
options.forEach(function(option) {
if(option.route) {
if(option.route[0] === "List" && option.route[2] !== 'Report') {
if (
option.route[0] === "List" &&
option.route[2] !== 'Report' &&
option.route[2] !== 'Inbox'
) {
option.route.splice(2);
}

var str_route = (typeof option.route==='string') ?
option.route : option.route.join('/');
if(routes.indexOf(str_route)===-1) {


+ 6
- 5
frappe/public/js/frappe/views/inbox/inbox_view.js Parādīt failu

@@ -94,19 +94,20 @@ frappe.views.InboxView = class InboxView extends frappe.views.ListView {
this.render_list();
this.on_row_checked();
this.render_count();
this.render_tags();
}

get_meta_html(email) {
const attachment = email.has_attachment ?
`<span class="fa fa-paperclip fa-large" title="${__('Has Attachments')}"></span>` : '';

const form_link = frappe.utils.get_form_link(email.reference_doctype, email.reference_name);
const link = email.reference_doctype && email.reference_doctype !== this.doctype ?
`<a class="text-muted grey" href="${form_link}"
let link = "";
if (email.reference_doctype && email.reference_doctype !== this.doctype) {
link = `<a class="text-muted grey"
href="${frappe.utils.get_form_link(email.reference_doctype, email.reference_name)}"
title="${__('Linked with {0}', [email.reference_doctype])}">
<i class="fa fa-link fa-large"></i>
</a>` : '';
</a>`;
}

const communication_date = comment_when(email.communication_date, true);
const status =


Notiek ielāde…
Atcelt
Saglabāt