Revision 58688
Added by Konstantina Galouni almost 4 years ago
| subscribe.component.ts | ||
|---|---|---|
| 77 | 77 |
this.subscribed = false; |
| 78 | 78 |
} else {
|
| 79 | 79 |
if (this.communityId) {
|
| 80 |
this._subscribeService.isSubscribedToCommunity(this.properties, this.communityId, email).subscribe(
|
|
| 80 |
this._subscribeService.isSubscribedToCommunity(this.properties, this.communityId).subscribe( |
|
| 81 | 81 |
res => {
|
| 82 | 82 |
this.subscribed = res; |
| 83 | 83 |
if (this.subscribed) {
|
| ... | ... | |
| 133 | 133 |
} else {
|
| 134 | 134 |
this.loading = true; |
| 135 | 135 |
this.showLoginAlert = false; |
| 136 |
this._subscribeService.subscribeToCommunity(this.communityId, email, this.properties.adminToolsAPIURL).subscribe(
|
|
| 136 |
this._subscribeService.subscribeToCommunity(this.properties.adminToolsAPIURL, this.communityId).subscribe(
|
|
| 137 | 137 |
res => {
|
| 138 | 138 |
this.loading = false; |
| 139 | 139 |
if (res.status && res.status != 200) {
|
| ... | ... | |
| 152 | 152 |
this.subscribeEvent.emit({
|
| 153 | 153 |
value: "ok" |
| 154 | 154 |
}); |
| 155 |
this._emailService.sendEmail(this.properties.adminToolsAPIURL + "/notifyForNewSubscribers/" + this.communityId, Composer.composeEmailToInformManagers(this.community.title, this.communityId, this.community.managers, email)).subscribe(
|
|
| 155 |
this._emailService.notifyForNewManagers(this.properties, this.communityId, Composer.composeEmailToInformManagers(this.community.title, this.communityId, this.community.managers, email, this.properties.adminPortalURL)).subscribe(
|
|
| 156 | 156 |
res => {
|
| 157 | 157 |
//console.log("The email has been sent successfully!")
|
| 158 | 158 |
}, |
| ... | ... | |
| 188 | 188 |
} else {
|
| 189 | 189 |
this.loading = true; |
| 190 | 190 |
//this.properties.adminToolsAPIURL |
| 191 |
this._subscribeService.unSubscribeToCommunity(this.communityId, email, this.properties.adminToolsAPIURL).subscribe(
|
|
| 191 |
this._subscribeService.unSubscribeToCommunity(this.properties, this.communityId).subscribe(
|
|
| 192 | 192 |
res => {
|
| 193 | 193 |
this.loading = false; |
| 194 | 194 |
if (res.status && res.status != 200) {
|
Also available in: Unified diff
[Trunk | Monitor]:
1. contact.component.ts & monitor.component.ts: "properties" as first parameter in methods of helper.service.ts.
2. home.component.ts & learn-how.component.ts & learn-in-depth.component.ts: "properties" as first parameter in methods of helper.service.ts | in methods of helper.service.ts check communityId "monitor".
3. searchFunders.component.ts: "Filter" entity has changed - replace field: "valueIsUnique: false" with "filterType: "checkbox".
4. invite.component.ts:
a. "properties" as first parameter in methods of helper.service.ts
b. create request path in service email.service.ts
5. subscribe.component.ts: Do not reveal users' (subscribers') emails:
a. Use new methods "isSubscribedToCommunity()", "subscribeToCommunity", "unSubscribeToCommunity" without email parameter (subscribe.service).
b. Use new method "notifyForNewManagers()" when more appropriate than "sendEmail()".