Commit d65e82d2 authored by Carsten Schoenert's avatar Carsten Schoenert

New upstream version 3.4.22+dfsg1

parent 38175e2e
...@@ -12,9 +12,8 @@ pipeline { ...@@ -12,9 +12,8 @@ pipeline {
parallel { parallel {
stage('JS Lint') { stage('JS Lint') {
agent { agent {
docker { dockerfile {
image 'node:9' label 'docker'
args '-u 0'
} }
} }
steps { steps {
......
This diff is collapsed.
...@@ -382,6 +382,10 @@ td.x-grid3-hd-menu-open .x-grid3-hd-inner { ...@@ -382,6 +382,10 @@ td.x-grid3-hd-menu-open .x-grid3-hd-inner {
.icon_mail_oof { .icon_mail_oof {
background-position: sprite-position($iconsmap, icon_mail_oof, $offset-y: $padding-medium + 2, $offset-x: $padding-medium - 3); background-position: sprite-position($iconsmap, icon_mail_oof, $offset-y: $padding-medium + 2, $offset-x: $padding-medium - 3);
} }
.icon_rule_oof {
@extend .icon_oof;
background-position: sprite-position($iconsmap, icon_oof, $offset-y: $padding-medium - 2, $offset-x: $padding-medium - 3);
}
.icon_contact_user { .icon_contact_user {
@extend .icon_contact_card; @extend .icon_contact_card;
background-position: sprite-position($iconsmap, icon_contact_card, $offset-y: $padding-medium + 2, $offset-x: $padding-medium - 2); background-position: sprite-position($iconsmap, icon_contact_card, $offset-y: $padding-medium + 2, $offset-x: $padding-medium - 2);
......
...@@ -22,7 +22,7 @@ Zarafa.ABOUT = "" ...@@ -22,7 +22,7 @@ Zarafa.ABOUT = ""
+ "GNU Affero General Public License for more details.</p>" + "GNU Affero General Public License for more details.</p>"
+ "<p>You should have received a copy of the GNU Affero General Public License " + "<p>You should have received a copy of the GNU Affero General Public License "
+ "along with this program. If not, see <a href=\"http://www.gnu.org/licenses/\" target=\"_blank\">http://www.gnu.org/licenses/</a>.</p>" + "along with this program. If not, see <a href=\"https://www.gnu.org/licenses/\" target=\"_blank\">https://www.gnu.org/licenses/</a>.</p>"
+ "<hr />" + "<hr />"
...@@ -30,7 +30,7 @@ Zarafa.ABOUT = "" ...@@ -30,7 +30,7 @@ Zarafa.ABOUT = ""
+ "<h1>Ext JS</h1>" + "<h1>Ext JS</h1>"
+ "<p>Copyright (C) Sencha, Inc. Ext JS is distributed under the terms of the GNU General Public License: <a href=\"http://www.gnu.org/copyleft/gpl.html\" target=\"_blank\">http://www.gnu.org/copyleft/gpl.html</a></p>" + "<p>Copyright (C) Sencha, Inc. Ext JS is distributed under the terms of the GNU General Public License: <a href=\"https://www.gnu.org/copyleft/gpl.html\" target=\"_blank\">https://www.gnu.org/copyleft/gpl.html</a></p>"
+ "<h1>Printer rendering</h1>" + "<h1>Printer rendering</h1>"
...@@ -58,7 +58,7 @@ Zarafa.ABOUT = "" ...@@ -58,7 +58,7 @@ Zarafa.ABOUT = ""
+ "<h1>TinyMCE</h1>" + "<h1>TinyMCE</h1>"
+ "<p>Copyright, Moxiecode Systems AB. Released under LGPL License: <a href=\"http://www.tinymce.com/license\" target=\"_blank\">http://www.tinymce.com/license</a></p>" + "<p>Copyright, Moxiecode Systems AB. Released under LGPL License: <a href=\"https://www.tinymce.com/license\" target=\"_blank\">https://www.tinymce.com/license</a></p>"
+ "<h1>TinyMCE PowerPaste</h1>" + "<h1>TinyMCE PowerPaste</h1>"
...@@ -76,4 +76,4 @@ Zarafa.ABOUT = "" ...@@ -76,4 +76,4 @@ Zarafa.ABOUT = ""
+ "GNU Affero General Public License for more details.</p>" + "GNU Affero General Public License for more details.</p>"
+ "You should have received a copy of the GNU Affero General Public License " + "You should have received a copy of the GNU Affero General Public License "
+ "along with this program. If not, see <a href=\"http://www.gnu.org/licenses/\" target=\"_blank\">http://www.gnu.org/licenses/</a>.</p>"; + "along with this program. If not, see <a href=\"https://www.gnu.org/licenses/\" target=\"_blank\">https://www.gnu.org/licenses/</a>.</p>";
...@@ -811,6 +811,9 @@ Ext.apply(Zarafa, { ...@@ -811,6 +811,9 @@ Ext.apply(Zarafa, {
this.startIdleTimeChecker(clientTimeout); this.startIdleTimeChecker(clientTimeout);
} }
// Starts shared stores unread email poller.
this.startSharedStoresHierarchyChecker();
// Check if the Wingdings font is installed // Check if the Wingdings font is installed
this.wingdingsInstalled = window.checkfont.exists('Wingdings'); this.wingdingsInstalled = window.checkfont.exists('Wingdings');
}, },
...@@ -884,6 +887,27 @@ Ext.apply(Zarafa, { ...@@ -884,6 +887,27 @@ Ext.apply(Zarafa, {
}]).defer(interval); //Start sending keepalives after interval milliseconds. }]).defer(interval); //Start sending keepalives after interval milliseconds.
}, },
/**
* Start the Shared Stores unread mail poller, fetches the hierarchy
* once to fill the server side cache.
* @private
*/
startSharedStoresHierarchyChecker: function()
{
const interval = container.getServerConfig().getSharedStorePollingInterval();
if (!Ext.isNumber(interval)) {
return;
}
// Fetch shared stores state on login.
container.getHierarchyStore().sendSharedStoreHierarchyUpdate();
setInterval(function() {
container.getHierarchyStore().sendSharedStoreHierarchyUpdate();
}, interval);
},
/** /**
* init UI by lazily constructing the main panel (implicit in container.getMainPanel) and * init UI by lazily constructing the main panel (implicit in container.getMainPanel) and
* setting the default context to visible. Note that during onHierarchyLoad we will also * setting the default context to visible. Note that during onHierarchyLoad we will also
......
...@@ -126,6 +126,9 @@ Zarafa.advancesearch.AdvanceSearchStore = Ext.extend(Zarafa.core.data.ListModule ...@@ -126,6 +126,9 @@ Zarafa.advancesearch.AdvanceSearchStore = Ext.extend(Zarafa.core.data.ListModule
var searchDate = ''; var searchDate = '';
switch (record.get('message_class')){ switch (record.get('message_class')){
case 'IPM.Note': case 'IPM.Note':
case 'IPM.Note.SMIME.MultipartSigned':
case 'IPM.Note.SMIME.SignedEncrypt':
case 'IPM.Note.SMIME':
searchDate = record.get('message_delivery_time') || record.get('last_modification_time'); searchDate = record.get('message_delivery_time') || record.get('last_modification_time');
break; break;
case 'IPM.Task': case 'IPM.Task':
......
...@@ -97,7 +97,6 @@ Zarafa.advancesearch.ui.SearchGridRenderers = { ...@@ -97,7 +97,6 @@ Zarafa.advancesearch.ui.SearchGridRenderers = {
value = _('To') + ': ' + value; value = _('To') + ': ' + value;
} }
} }
var userName = Ext.util.Format.htmlEncode(value); var userName = Ext.util.Format.htmlEncode(value);
return Zarafa.common.ui.grid.Renderers.presenceStatus(userName, p, userRecord); return Zarafa.common.ui.grid.Renderers.presenceStatus(userName, p, userRecord);
}, },
......
...@@ -535,7 +535,7 @@ Zarafa.calendar.CalendarContext = Ext.extend(Zarafa.core.Context, { ...@@ -535,7 +535,7 @@ Zarafa.calendar.CalendarContext = Ext.extend(Zarafa.core.Context, {
return { return {
xtype: 'menuitem', xtype: 'menuitem',
id: 'zarafa-maintoolbar-newitem-appointment', id: 'zarafa-maintoolbar-newitem-appointment',
tooltip : _('Appointment')+' (Ctrl + Alt + A)', tooltip: _('Appointment') + ' (Ctrl + Alt + A)',
plugins : 'zarafa.menuitemtooltipplugin', plugins : 'zarafa.menuitemtooltipplugin',
text: _('Appointment'), text: _('Appointment'),
handler: function() handler: function()
......
...@@ -1124,6 +1124,12 @@ Zarafa.calendar.dialogs.AppointmentTab = Ext.extend(Ext.form.FormPanel, { ...@@ -1124,6 +1124,12 @@ Zarafa.calendar.dialogs.AppointmentTab = Ext.extend(Ext.form.FormPanel, {
return; return;
} }
// Workaround for KC-1270, backend should not return
// folders with inaccessible parent folder.
if (!dataItem.getParentFolder()) {
return;
}
var displayString = dataItem.get('display_name'); var displayString = dataItem.get('display_name');
var mapiStore = dataItem.getParentFolder().getMAPIStore(); var mapiStore = dataItem.getParentFolder().getMAPIStore();
...@@ -1186,6 +1192,24 @@ Zarafa.calendar.dialogs.AppointmentTab = Ext.extend(Ext.form.FormPanel, { ...@@ -1186,6 +1192,24 @@ Zarafa.calendar.dialogs.AppointmentTab = Ext.extend(Ext.form.FormPanel, {
createInStore.add(readerData.records); createInStore.add(readerData.records);
createInStore.applySort(); createInStore.applySort();
combo.view.bindStore(createInStore); combo.view.bindStore(createInStore);
// Add tool-tip
this.addToolTip(combo);
},
/**
* Helper function which add tool-tip only if text-overflowed.
* @param {Ext.form.ComboBox} combo The combobox which was selected
* @private
*/
addToolTip : function(combo){
var children = combo.innerList.dom.children;
for (var i = 0; i < children.length; i++) {
// check if text gets overflowed or not
if (children[i].offsetWidth < children[i].scrollWidth) {
children[i].setAttribute('ext:qtip', children[i].textContent);
}
}
}, },
/** /**
......
...@@ -54,12 +54,9 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa ...@@ -54,12 +54,9 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa
xtype : 'zarafa.meetingrequestbuttons' xtype : 'zarafa.meetingrequestbuttons'
},{ },{
xtype: 'button', xtype: 'button',
overflowText: _('Send invitation'), overflowText: _('Send'),
text: _('Send'), text: _('Send'),
tooltip: { tooltip: _('Send') + ' (Ctrl + Enter)',
title: _('Send invitation'),
text: _('Send invitation to recipients') + ' (Ctrl + ENTER)'
},
iconCls : 'buttons-icon_send_white', iconCls : 'buttons-icon_send_white',
cls: 'button_sendMail zarafa-action', cls: 'button_sendMail zarafa-action',
ref: 'sendInvitation', ref: 'sendInvitation',
...@@ -67,12 +64,9 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa ...@@ -67,12 +64,9 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa
scope: this scope: this
},{ },{
xtype: 'button', xtype: 'button',
text : _('Save'), text : _('Save')+' & '+_('Close'),
overflowText: _('Save & Close'), overflowText: _('Save')+' & '+_('Close'),
tooltip: { tooltip: _('Save')+' & '+_('Close') + ' (Ctrl + S)',
title: _('Save & Close'),
text: _('Save appointment and close dialog') + ' (Ctrl + S)'
},
cls : 'zarafa-action', cls : 'zarafa-action',
iconCls : 'buttons-icon_save_white', iconCls : 'buttons-icon_save_white',
ref : 'saveAppointment', ref : 'saveAppointment',
...@@ -81,38 +75,29 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa ...@@ -81,38 +75,29 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa
},{ },{
xtype: 'button', xtype: 'button',
overflowText: _('Save'), overflowText: _('Save'),
tooltip: { tooltip: _('Save') + ' (Ctrl + S)',
title: _('Save'),
text: _('Save without sending an invitation to recipients') + ' (Ctrl + S)'
},
cls: 'tb-calendar-btn-save', cls: 'tb-calendar-btn-save',
iconCls: 'icon_saveEmail', iconCls: 'icon_saveEmail',
ref : 'saveMeeting', ref : 'saveMeeting',
handler: this.onSaveButton, handler: this.onSaveButton,
scope: this scope: this
},{ },{
xtype : 'button', xtype: 'button',
overflowText: _('Delete'), overflowText: _('Delete'),
tooltip: { tooltip: _('Delete'),
title: _('Delete'),
text: _('Delete this appointment')
},
cls: 'tb-calendar-btn-delete', cls: 'tb-calendar-btn-delete',
iconCls : 'icon_delete', iconCls: 'icon_delete',
ref: 'deleteAppointment', ref: 'deleteAppointment',
handler : this.onDeleteButton, handler: this.onDeleteButton,
scope : this scope: this
},{ },{
xtype: 'zarafa.attachmentbutton', xtype: 'zarafa.attachmentbutton',
plugins : [ 'zarafa.recordcomponentupdaterplugin' ], plugins : [ 'zarafa.recordcomponentupdaterplugin' ],
ref : 'normalAttachmentsButton', // FIXME: Remove after WA-4880 is implemented ref: 'normalAttachmentsButton', // FIXME: Remove after WA-4880 is implemented
overflowText: _('Add attachment'), overflowText: _('Add attachment'),
tooltip: { tooltip: _('Add attachment'),
title: _('Add attachment'),
text: _('Add attachments to this appointment')
},
cls: 'tb-calendar-btn-add-attachment', cls: 'tb-calendar-btn-add-attachment',
iconCls : 'icon_attachment', iconCls: 'icon_attachment',
// Add a listener to the component added event to set use the correct update function when the toolbar overflows // Add a listener to the component added event to set use the correct update function when the toolbar overflows
// (i.e. is too wide for the panel) and Ext moves the button to a menuitem. // (i.e. is too wide for the panel) and Ext moves the button to a menuitem.
listeners : { listeners : {
...@@ -121,32 +106,19 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa ...@@ -121,32 +106,19 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa
} }
},{ },{
// FIXME: Remove after WA-4880 is implemented // FIXME: Remove after WA-4880 is implemented
xtype : 'button', xtype: 'button',
ref : 'occurenceAttachmentsButton', disabled: true,
overflowText : _('Cannot add attachment'), ref: 'occurenceAttachmentsButton',
tooltip : { overflowText: _('Add attachment'),
title : _('Cannot add attachment'), tooltip: _('Attachments cannot be modified for a single occurence'),
text : _('Attachments cannot be modified for a single occurence')
},
cls: 'tb-calendar-btn-occurence-attachment', cls: 'tb-calendar-btn-occurence-attachment',
iconCls : 'icon_attachment', iconCls: 'icon_attachment'
handler : function() {
Ext.MessageBox.show({
title : _('Warning'),
msg : _('Attachments cannot be modified for a single occurence'),
buttons : Ext.Msg.OK,
icon : Ext.MessageBox.WARNING
});
}
},{ },{
xtype: 'button', xtype: 'button',
overflowText: _('Print'), overflowText: _('Print'),
tooltip: { tooltip: _('Print'),
title: _('Print'),
text: _('Print this appointment')
},
cls: 'tb-calendar-btn-print', cls: 'tb-calendar-btn-print',
iconCls : 'icon_print', iconCls: 'icon_print',
handler: function() { handler: function() {
Zarafa.common.Actions.openPrintDialog(this.record); Zarafa.common.Actions.openPrintDialog(this.record);
}, },
...@@ -154,10 +126,7 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa ...@@ -154,10 +126,7 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa
},{ },{
xtype: 'button', xtype: 'button',
overflowText: _('Check names'), overflowText: _('Check names'),
tooltip: { tooltip: _('Check names'),
title: _('Check names'),
text: _('Check all recipient names')
},
cls: 'tb-calendar-btn-checknames', cls: 'tb-calendar-btn-checknames',
iconCls: 'icon_checkNames', iconCls: 'icon_checkNames',
ref: 'checkNames', ref: 'checkNames',
...@@ -197,23 +166,15 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa ...@@ -197,23 +166,15 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa
xtype: 'button', xtype: 'button',
text: _('Recurrence'), text: _('Recurrence'),
overflowText: _('Recurrence'), overflowText: _('Recurrence'),
tooltip: {
title: _('Recurrence'),
text: _('Open the recurrence dialog')
},
cls: 'tb-calendar-btn-recurrence', cls: 'tb-calendar-btn-recurrence',
iconCls: 'icon_recurrence', iconCls: 'icon_recurrence',
ref: 'recurrence', ref: 'recurrence',
handler : this.onSetRecurrence, handler: this.onSetRecurrence,
scope: this scope: this
},{ },{
xtype: 'button', xtype: 'button',
text: _('Invite attendees'), text: _('Invite attendees'),
overflowText: _('Invite attendees'), overflowText: _('Invite attendees'),
tooltip: {
title: _('Invite attendees'),
text: _('Invite attendees for this appointment')
},
cls: 'tb-calendar-btn-ivite-attendees', cls: 'tb-calendar-btn-ivite-attendees',
iconCls: 'icon_invite_attendees', iconCls: 'icon_invite_attendees',
ref: 'inviteAttendees', ref: 'inviteAttendees',
...@@ -222,10 +183,6 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa ...@@ -222,10 +183,6 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa
},{ },{
xtype: 'button', xtype: 'button',
text: _('Cancel invitation'), text: _('Cancel invitation'),
tooltip: {
title: _('Cancel invitation'),
text: _('Convert this meeting request to an appointment by removing attendees')
},
overflowText: _('Cancel invitation'), overflowText: _('Cancel invitation'),
cls: 'tb-calendar-btn-cancel', cls: 'tb-calendar-btn-cancel',
iconCls: 'icon_cancel_meeting_request', iconCls: 'icon_cancel_meeting_request',
...@@ -235,10 +192,7 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa ...@@ -235,10 +192,7 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa
},{ },{
xtype: 'button', xtype: 'button',
overflowText: _('High priority'), overflowText: _('High priority'),
tooltip: { tooltip: _('Mark this appointment as high priority'),
title: _('High priority'),
text: _('Mark this appointment as high priority')
},
cls: 'tb-calendar-btn-high-priority', cls: 'tb-calendar-btn-high-priority',
iconCls: 'icon_setHighPriority', iconCls: 'icon_setHighPriority',
ref: 'highPriority', ref: 'highPriority',
...@@ -250,10 +204,7 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa ...@@ -250,10 +204,7 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa
},{ },{
xtype: 'button', xtype: 'button',
overflowText: _('Low priority'), overflowText: _('Low priority'),
tooltip: { tooltip: _('Mark this appointment as low priority'),
title: _('Low priority'),
text: _('Mark this appointment as low priority')
},
cls: 'tb-calendar-btn-low-priority', cls: 'tb-calendar-btn-low-priority',
iconCls: 'icon_setLowPriority', iconCls: 'icon_setLowPriority',
ref: 'lowPriority', ref: 'lowPriority',
...@@ -265,10 +216,7 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa ...@@ -265,10 +216,7 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa
},{ },{
xtype: 'button', xtype: 'button',
overflowText: _('Categories'), overflowText: _('Categories'),
tooltip: { tooltip: _('Open the categories dialog'),
title: _('Categories'),
text: _('Open the categories dialog')
},
cls: 'tb-calendar-btn-categories', cls: 'tb-calendar-btn-categories',
iconCls: 'icon_categories', iconCls: 'icon_categories',
handler: this.onCategories, handler: this.onCategories,
...@@ -276,10 +224,7 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa ...@@ -276,10 +224,7 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa
},{ },{
xtype: 'button', xtype: 'button',
overflowText: _('Private'), overflowText: _('Private'),
tooltip: { tooltip: _('Mark this appointment as private'),
title: _('Private'),
text: _('Mark this appointment as private')
},
cls: 'tb-calendar-btn-private', cls: 'tb-calendar-btn-private',
iconCls: 'icon_private', iconCls: 'icon_private',
ref: 'setPrivate', ref: 'setPrivate',
...@@ -434,13 +379,8 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa ...@@ -434,13 +379,8 @@ Zarafa.calendar.dialogs.AppointmentToolbar = Ext.extend(Zarafa.core.ui.ContentPa
onSaveButtonBeforeShow : function(button) onSaveButtonBeforeShow : function(button)
{ {
if(this.record.isMeetingReceived()) { if(this.record.isMeetingReceived()) {
var tooltip = { button.setTooltip(_('Save') + ' (Ctrl + S)');
title: _('Save & Close'),
text: _('Save meeting request and close dialog') + ' (Ctrl + S)'
};
button.setTooltip(tooltip);
} }
}, },
/** /**
......
...@@ -16,21 +16,21 @@ Zarafa.calendar.dialogs.SendMeetingRequestConfirmationPanel = Ext.extend(Ext.for ...@@ -16,21 +16,21 @@ Zarafa.calendar.dialogs.SendMeetingRequestConfirmationPanel = Ext.extend(Ext.for
* @property * @property
* @type String * @type String
*/ */
acceptInfoString : _('This meeting has been accepted and will be moved to your Calendar. Do you want to include comments with your response?'), acceptInfoString : _('This meeting will be accepted and moved to your calendar. Do you want to include comments with your response?'),
/** /**
* Info string that will be shown for attendee that is going to tentatively accept meeting request. * Info string that will be shown for attendee that is going to tentatively accept meeting request.
* @property * @property
* @type String * @type String
*/ */
tentativeAcceptInfoString : _('This meeting has been tentatively accepted and will be moved to your Calendar. Do you want to include comments with your response?'), tentativeAcceptInfoString : _('This meeting will be tentatively accepted and moved to your calendar. Do you want to include comments with your response?'),
/** /**
* Info string that will be shown for attendee that is going to decline meeting request. * Info string that will be shown for attendee that is going to decline meeting request.
* @property * @property
* @type String * @type String
*/ */
declineInfoString : _('This meeting has been declined and will be moved to the Deleted Items folder. Do you want to include comments with your response?'), declineInfoString : _('This meeting will be declined and moved to your Deleted Items folder. Do you want to include comments with your response?'),
/** /**
* @constructor * @constructor
...@@ -56,7 +56,7 @@ Zarafa.calendar.dialogs.SendMeetingRequestConfirmationPanel = Ext.extend(Ext.for ...@@ -56,7 +56,7 @@ Zarafa.calendar.dialogs.SendMeetingRequestConfirmationPanel = Ext.extend(Ext.for
style: 'padding-bottom: 10px;' style: 'padding-bottom: 10px;'
},{ },{
xtype:'radio', xtype:'radio',
boxLabel: _('Edit the response before Sending.'), boxLabel: _('Edit the response before sending'),
name: 'sendmrconfirmation', name: 'sendmrconfirmation',
autoHeight: true, autoHeight: true,
listeners : { listeners : {
......
...@@ -1022,7 +1022,7 @@ Zarafa.calendar.ui.CalendarPanel = Ext.extend(Ext.Panel, { ...@@ -1022,7 +1022,7 @@ Zarafa.calendar.ui.CalendarPanel = Ext.extend(Ext.Panel, {
*/ */
createRecordCopy: function (copiedRecord) createRecordCopy: function (copiedRecord)
{ {
var record = this.model.createRecord(undefined, this.getNewDateRange(copiedRecord)); var record = this.model.createRecord(undefined, undefined, this.getNewDateRange(copiedRecord));
var remainder = copiedRecord.get('reminder'); var remainder = copiedRecord.get('reminder');
// Outlook add's this 0x00000008 and 0x00000080 flags along with auxApptFlagCopied in // Outlook add's this 0x00000008 and 0x00000080 flags along with auxApptFlagCopied in
...@@ -1031,7 +1031,7 @@ Zarafa.calendar.ui.CalendarPanel = Ext.extend(Ext.Panel, { ...@@ -1031,7 +1031,7 @@ Zarafa.calendar.ui.CalendarPanel = Ext.extend(Ext.Panel, {
// between original and copied appointment/meeting record in calender. // between original and copied appointment/meeting record in calender.
var auxiliaryFlags = Zarafa.core.mapi.AppointmentAuxiliaryFlags.auxApptFlagCopied | 0x00000008 | 0x00000080; var auxiliaryFlags = Zarafa.core.mapi.AppointmentAuxiliaryFlags.auxApptFlagCopied | 0x00000008 | 0x00000080;
Ext.apply(record.data, { Ext.apply(record.data, {
'subject' : !copiedRecord.isCopied() ? _('Copy')+":"+copiedRecord.get('subject') : copiedRecord.get('subject'), 'subject' : !copiedRecord.isCopied() ? _('Copy')+": "+copiedRecord.get('subject') : copiedRecord.get('subject'),
'body' : copiedRecord.get('body'), 'body' : copiedRecord.get('body'),
'location' : copiedRecord.get('location'), 'location' : copiedRecord.get('location'),
'importance' : copiedRecord.get('importance'), 'importance' : copiedRecord.get('importance'),
......
...@@ -29,6 +29,13 @@ Zarafa.common.Actions = { ...@@ -29,6 +29,13 @@ Zarafa.common.Actions = {
*/ */
totalFiles : undefined, totalFiles : undefined,
/**
* Defines if the imported item should be shown after import.
* @property
* @type Boolean
*/
showImported : false,
/** /**
* Open a {@link Zarafa.common.dialogs.CopyMoveContentPanel CopyMoveContentPanel} for * Open a {@link Zarafa.common.dialogs.CopyMoveContentPanel CopyMoveContentPanel} for
* copying or moving {@link Zarafa.core.data.IPMRecord records} to the * copying or moving {@link Zarafa.core.data.IPMRecord records} to the
...@@ -1178,11 +1185,13 @@ Zarafa.common.Actions = { ...@@ -1178,11 +1185,13 @@ Zarafa.common.Actions = {
* *
* @param {Object/Array} files The files is contains file information. * @param {Object/Array} files The files is contains file information.
* @param {Zarafa.hierarchy.data.MAPIFolderRecord} folder folder to which files needs to be imported. * @param {Zarafa.hierarchy.data.MAPIFolderRecord} folder folder to which files needs to be imported.
* @param {Boolean} show Open the imported item
*/ */
importEmlCallback : function(files, folder) importEmlCallback : function(files, folder, show)
{ {
this.brokenFiles = []; this.brokenFiles = [];
this.totalFiles = files.length; this.totalFiles = files.length;
this.showImported = show === true;
this.readFiles(files, folder); this.readFiles(files, folder);
},