From 21def67f83716fa7a44ce88b9829f8cf0b8be3c9 Mon Sep 17 00:00:00 2001 From: ralf Date: Mon, 2 May 2022 11:43:51 +0200 Subject: [PATCH] fixed a couple more calls to egw.link_title() without 3rd parameter --- api/js/etemplate/et2_widget_selectAccount.ts | 4 ++-- api/js/etemplate/et2_widget_taglist.ts | 2 +- api/js/etemplate/et2_widget_vfs.ts | 13 ++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/api/js/etemplate/et2_widget_selectAccount.ts b/api/js/etemplate/et2_widget_selectAccount.ts index 213019857c..976a1487f3 100644 --- a/api/js/etemplate/et2_widget_selectAccount.ts +++ b/api/js/etemplate/et2_widget_selectAccount.ts @@ -268,7 +268,7 @@ export class et2_selectAccount extends et2_selectbox if(!found && !isNaN(search[j])) { // Add it in - var name = this.egw().link_title('api-accounts', search[j]); + var name = this.egw().link_title('api-accounts', search[j], false); if (name) // was already cached on client-side { update_options = true; @@ -904,4 +904,4 @@ export class et2_selectAccount_ro extends et2_link_string } } } -et2_register_widget(et2_selectAccount_ro, ["select-account_ro"]); +et2_register_widget(et2_selectAccount_ro, ["select-account_ro"]); \ No newline at end of file diff --git a/api/js/etemplate/et2_widget_taglist.ts b/api/js/etemplate/et2_widget_taglist.ts index 88328dd4d8..f6c208e46d 100644 --- a/api/js/etemplate/et2_widget_taglist.ts +++ b/api/js/etemplate/et2_widget_taglist.ts @@ -1090,7 +1090,7 @@ export class et2_taglist_account extends et2_taglist else if (typeof v != 'object' && !isNaN(v) && (typeof v != 'string' || v.match(this.int_reg_exp))) { v = parseInt(v); - let label = this.egw().link_title('api-accounts', v); + let label = this.egw().link_title('api-accounts', v, false); if (label) // already cached on client-side --> replace it { values[i] = { diff --git a/api/js/etemplate/et2_widget_vfs.ts b/api/js/etemplate/et2_widget_vfs.ts index 97cfe4ac33..9165f628ce 100644 --- a/api/js/etemplate/et2_widget_vfs.ts +++ b/api/js/etemplate/et2_widget_vfs.ts @@ -393,19 +393,18 @@ export class et2_vfsPath extends et2_vfsName else if(i === 3 && !isNaN(text)) { // we first need to call link_title without callback, as callback would be called for cache-hits too! - let link_title = this.egw().link_title(path_parts[2], path_parts[3]); + let link_title = this.egw().link_title(path_parts[2], path_parts[3], false); if(link_title && typeof link_title !== 'undefined') { text = link_title; } else { - this.egw().link_title(path_parts[2], path_parts[3], - function(title) { - if(!title) return; - jQuery('li',this.span).first().text(title); - }, this - ); + this.egw().link_title(path_parts[2], path_parts[3], true).then(title => + { + if(!title) return; + jQuery('li',this.span).first().text(title); + }); } } }