Skip to content

Commit

Permalink
Merge branch 'pu/ccheng/rt_247380' into '2024.11'
Browse files Browse the repository at this point in the history
fix(Filemanager/js): remove duplicated signature from sendAsMail action

See merge request tine20/tine20!6595
  • Loading branch information
ccheng-dev committed Feb 18, 2025
2 parents e25f1f8 + d528b54 commit 0408a36
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions tine20/Filemanager/js/FilePublishedDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ Tine.Filemanager.FilePublishedDialog = Ext.extend(Ext.FormPanel, {
body += '<br>' + this.app.i18n._("Password") + ": " + this.password;
}

let defaults = Tine.Felamimail.Model.Message.getDefaultData();
defaults.body = body + Tine.Felamimail.getSignature();
const defaults = Tine.Felamimail.Model.Message.getDefaultData();
defaults.body = body ;

const record = new Tine.Felamimail.Model.Message(defaults, 0);

Expand Down
6 changes: 2 additions & 4 deletions tine20/Filemanager/js/FileSystemLinkDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,8 @@ Tine.Filemanager.FileSystemLinkDialog = Ext.extend(Ext.FormPanel, {
},

onSendAsMail: function () {
let body = `<a href="${this.link}" target="_blank">${Ext.ux.util.urlCoder.decodeURI(this.link)}</a>`;

let defaults = Tine.Felamimail.Model.Message.getDefaultData();
defaults.body = body + Tine.Felamimail.getSignature();
const defaults = Tine.Felamimail.Model.Message.getDefaultData();
defaults.body = `<a href="${this.link}" target="_blank">${Ext.ux.util.urlCoder.decodeURI(this.link)}</a>`;

const record = new Tine.Felamimail.Model.Message(defaults, 0);

Expand Down

0 comments on commit 0408a36

Please sign in to comment.