This repository was archived by the owner on Mar 4, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +16
-11
lines changed Expand file tree Collapse file tree 2 files changed +16
-11
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ import angular from 'angular'
20
20
mailchimpApi . one ( 'users' , user . userId )
21
21
. one ( 'preferences' , 'email' ) . get ( )
22
22
. then ( function ( resp ) {
23
- resolve ( resp )
23
+ resolve ( resp . subscriptions )
24
24
} )
25
25
. catch ( function ( err ) {
26
26
if ( err . status === 404 ) {
@@ -42,21 +42,20 @@ import angular from 'angular'
42
42
43
43
function saveEmailPreferences ( user , preferences ) {
44
44
var settings = {
45
- userId : user . userId ,
46
45
firstName : user . firstName ,
47
46
lastName : user . lastName ,
48
47
subscriptions : { }
49
48
}
50
49
if ( ! preferences ) {
51
- settings . subscriptions [ CONSTANTS . MAILCHIMP_NL_GEN ] = true
50
+ settings . subscriptions [ 'TOPCODER_NL_GEN' ] = true
52
51
} else {
53
52
settings . subscriptions = preferences
54
53
}
55
54
return $q ( function ( resolve , reject ) {
56
55
mailchimpApi . one ( 'users' , user . userId )
57
- . customPUT ( settings , 'preferences/email' )
56
+ . customPUT ( { param : settings } , 'preferences/email' )
58
57
. then ( function ( resp ) {
59
- resolve ( resp )
58
+ resolve ( resp . subscriptions )
60
59
} )
61
60
. catch ( function ( err ) {
62
61
logger . error ( 'Error adding member to subscription list' , err )
Original file line number Diff line number Diff line change @@ -68,24 +68,30 @@ import angular from 'angular'
68
68
if ( ! subscription ) {
69
69
// add member to the list with default preferences
70
70
UserPreferencesService . saveEmailPreferences ( userData ) . then ( function ( resp ) {
71
- logger . debug ( resp )
71
+ logger . debug ( JSON . stringify ( resp ) )
72
+ validateState ( resp )
73
+
72
74
} ) . catch ( function ( err ) {
73
75
// no error to user
74
76
//TODO some error alert to community admin
75
77
logger . debug ( 'error in adding user to member list' )
76
78
} )
77
79
} else {
78
80
if ( subscription ) {
79
- vm . newsletters . forEach ( function ( newsletter ) {
80
- if ( subscription [ newsletter . id ] ) {
81
- newsletter . enabled = true
82
- }
83
- } )
81
+ validateState ( subscription )
84
82
}
85
83
}
86
84
} )
87
85
}
88
86
87
+ function validateState ( subscription ) {
88
+ vm . newsletters . forEach ( function ( newsletter ) {
89
+ if ( subscription [ newsletter . id ] ) {
90
+ newsletter . enabled = true
91
+ }
92
+ } )
93
+ }
94
+
89
95
function isDirty ( ) {
90
96
var dirty = false
91
97
vm . newsletters . forEach ( function ( newsletter ) {
You can’t perform that action at this time.
0 commit comments