TF-3316 Fix inconsistent vacation message
This commit is contained in:
@@ -660,7 +660,7 @@ packages:
|
||||
description:
|
||||
path: "."
|
||||
ref: main
|
||||
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
|
||||
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
|
||||
url: "https://github.com/linagora/jmap-dart-client.git"
|
||||
source: git
|
||||
version: "0.3.2"
|
||||
|
||||
@@ -296,7 +296,7 @@ packages:
|
||||
description:
|
||||
path: "."
|
||||
ref: main
|
||||
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
|
||||
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
|
||||
url: "https://github.com/linagora/jmap-dart-client.git"
|
||||
source: git
|
||||
version: "0.3.2"
|
||||
|
||||
+1
-1
@@ -296,7 +296,7 @@ packages:
|
||||
description:
|
||||
path: "."
|
||||
ref: main
|
||||
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
|
||||
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
|
||||
url: "https://github.com/linagora/jmap-dart-client.git"
|
||||
source: git
|
||||
version: "0.3.2"
|
||||
|
||||
@@ -296,7 +296,7 @@ packages:
|
||||
description:
|
||||
path: "."
|
||||
ref: main
|
||||
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
|
||||
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
|
||||
url: "https://github.com/linagora/jmap-dart-client.git"
|
||||
source: git
|
||||
version: "0.3.2"
|
||||
|
||||
@@ -22,7 +22,6 @@ extension VacationResponseExtension on VacationResponse {
|
||||
endTime: toDate?.value != null
|
||||
? TimeOfDay.fromDateTime(toDate!.value.toLocal())
|
||||
: null,
|
||||
messagePlainText: textBody,
|
||||
messageHtmlText: htmlBody,
|
||||
subject: subject,
|
||||
vacationStopEnabled: toDate != null
|
||||
@@ -78,7 +77,6 @@ extension VacationResponseExtension on VacationResponse {
|
||||
UTCDate? fromDate,
|
||||
UTCDate? toDate,
|
||||
String? subject,
|
||||
String? textBody,
|
||||
String? htmlBody
|
||||
}) {
|
||||
return VacationResponse(
|
||||
@@ -86,7 +84,6 @@ extension VacationResponseExtension on VacationResponse {
|
||||
fromDate: fromDate ?? this.fromDate,
|
||||
toDate: toDate ?? this.toDate,
|
||||
subject: subject ?? this.subject,
|
||||
textBody: textBody ?? this.textBody,
|
||||
htmlBody: htmlBody ?? this.htmlBody
|
||||
);
|
||||
}
|
||||
|
||||
@@ -14,7 +14,6 @@ class VacationPresentation with EquatableMixin, OptionParamMixin {
|
||||
final TimeOfDay? startTime;
|
||||
final DateTime? endDate;
|
||||
final TimeOfDay? endTime;
|
||||
final String? messagePlainText;
|
||||
final String? messageHtmlText;
|
||||
final String? subject;
|
||||
final bool vacationStopEnabled;
|
||||
@@ -25,7 +24,6 @@ class VacationPresentation with EquatableMixin, OptionParamMixin {
|
||||
this.startTime,
|
||||
this.endDate,
|
||||
this.endTime,
|
||||
this.messagePlainText,
|
||||
this.messageHtmlText,
|
||||
this.subject,
|
||||
this.vacationStopEnabled = false,
|
||||
@@ -52,7 +50,6 @@ class VacationPresentation with EquatableMixin, OptionParamMixin {
|
||||
startTime: getOptionParam(startTimeOption, startTime),
|
||||
endDate: getOptionParam(endDateOption, endDate),
|
||||
endTime: getOptionParam(endTimeOption, endTime),
|
||||
messagePlainText: getOptionParam(messagePlainTextOption, messagePlainText),
|
||||
messageHtmlText: getOptionParam(messageHtmlTextOption, messageHtmlText),
|
||||
subject: getOptionParam(subjectOption, subject),
|
||||
vacationStopEnabled: vacationStopEnabled ?? this.vacationStopEnabled
|
||||
@@ -81,7 +78,6 @@ class VacationPresentation with EquatableMixin, OptionParamMixin {
|
||||
endDate,
|
||||
endTime,
|
||||
vacationStopEnabled,
|
||||
messagePlainText,
|
||||
messageHtmlText,
|
||||
subject,
|
||||
];
|
||||
@@ -93,7 +89,6 @@ extension VacationPresentationExtension on VacationPresentation {
|
||||
isEnabled: isEnabled,
|
||||
fromDate: fromDate != null ? UTCDate(fromDate!.toUtc()) : null,
|
||||
toDate: toDate != null ? UTCDate(toDate!.toUtc()) : null,
|
||||
textBody: messagePlainText,
|
||||
htmlBody: messageHtmlText,
|
||||
subject: subject,
|
||||
);
|
||||
|
||||
@@ -90,7 +90,7 @@ class VacationController extends BaseController {
|
||||
void _initializeValueForVacation(VacationPresentation newVacation) {
|
||||
vacationPresentation.value = newVacation;
|
||||
subjectTextController.text = newVacation.subject ?? '';
|
||||
updateMessageHtmlText(newVacation.messageHtmlText ?? newVacation.messagePlainText ?? '');
|
||||
updateMessageHtmlText(newVacation.messageHtmlText ?? '');
|
||||
if (PlatformInfo.isWeb) {
|
||||
_richTextControllerForWeb.editorController.setText(newVacation.messageHtmlText ?? '');
|
||||
} else {
|
||||
|
||||
+1
-1
@@ -652,7 +652,7 @@ packages:
|
||||
description:
|
||||
path: "."
|
||||
ref: main
|
||||
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
|
||||
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
|
||||
url: "https://github.com/linagora/jmap-dart-client.git"
|
||||
source: git
|
||||
version: "0.3.2"
|
||||
|
||||
+1
-1
@@ -1332,7 +1332,7 @@ packages:
|
||||
description:
|
||||
path: "."
|
||||
ref: main
|
||||
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
|
||||
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
|
||||
url: "https://github.com/linagora/jmap-dart-client.git"
|
||||
source: git
|
||||
version: "0.3.2"
|
||||
|
||||
@@ -296,7 +296,7 @@ packages:
|
||||
description:
|
||||
path: "."
|
||||
ref: main
|
||||
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
|
||||
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
|
||||
url: "https://github.com/linagora/jmap-dart-client.git"
|
||||
source: git
|
||||
version: "0.3.2"
|
||||
|
||||
@@ -288,7 +288,7 @@ packages:
|
||||
description:
|
||||
path: "."
|
||||
ref: main
|
||||
resolved-ref: "392f12f7a1f6babfa64c143909178c8e1451c69f"
|
||||
resolved-ref: "278183b54ccfcda7396273c556609d28194e34f1"
|
||||
url: "https://github.com/linagora/jmap-dart-client.git"
|
||||
source: git
|
||||
version: "0.3.2"
|
||||
|
||||
Reference in New Issue
Block a user