(js) Fix email reminder with attendees

Fixes #4115
pull/218/head^2
Francis Lachapelle 2017-04-12 14:56:38 -04:00
parent 8bcda19799
commit 6fd9927092
3 changed files with 17 additions and 25 deletions

1
NEWS
View File

@ -9,6 +9,7 @@ Enhancements
Bug fixes Bug fixes
- [web] fixed attachment path when inside multiple body parts - [web] fixed attachment path when inside multiple body parts
- [web] fixed email reminder with attendees (#4115)
- [core] cherry-picked comma escaping fix from v2 (#3296) - [core] cherry-picked comma escaping fix from v2 (#3296)
- [core] fix sogo-tool restore potentially crashing on corrupted data (#4048) - [core] fix sogo-tool restore potentially crashing on corrupted data (#4048)
- [eas] set reply/forwarded flags when ReplaceMime is set (#4133) - [eas] set reply/forwarded flags when ReplaceMime is set (#4133)

View File

@ -40,22 +40,23 @@
<md-radio-button value="email"> <md-radio-button value="email">
<var:string label:value="Send an E-mail"/> <var:string label:value="Send an E-mail"/>
</md-radio-button> </md-radio-button>
<div layout="row" flex-offset="5"
ng-show="editor.component.canRemindAttendeesByEmail()">
<md-checkbox ng-model="editor.component.alarm.organizer"
ng-true-value="1"
ng-false-value="0"
label:aria-label="Email Organizer">
<var:string label:value="Email Organizer"/>
</md-checkbox>
<var:entity const:name="nbsp" />
<md-checkbox ng-model="editor.component.alarm.attendees"
ng-true-value="1"
ng-false-value="0"
label:aria-label="Email Attendees">
<var:string label:value="Email Attendees"/>
</md-checkbox>
</div>
</md-radio-group> </md-radio-group>
<div layout="row" flex-offset="5"
ng-show="editor.component.canRemindAttendeesByEmail()">
<md-checkbox ng-model="editor.component.alarm.organizer"
ng-true-value="1"
ng-false-value="0"
label:aria-label="Email Organizer">
<var:string label:value="Email Organizer"/>
</md-checkbox>
<md-checkbox ng-model="editor.component.alarm.attendees"
ng-true-value="1"
ng-false-value="0"
label:aria-label="Email Attendees">
<var:string label:value="Email Attendees"/>
</md-checkbox>
</div>
</var:if> </var:if>
</container> </container>

View File

@ -689,16 +689,6 @@
return (this.occurrenceId && this.userHasRSVP); return (this.occurrenceId && this.userHasRSVP);
}; };
/**
* @function isReadOnly
* @memberof Component.prototype
* @desc Check if the component is not editable and not an invitation
* @returns true or false
*/
Component.prototype.isReadOnly = function() {
return (this.isReadOnly && !this.userHasRSVP);
};
/** /**
* @function enablePercentComplete * @function enablePercentComplete
* @memberof Component.prototype * @memberof Component.prototype