taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1457 from alexhermida/ft/force_initialize_localstorage_key 

Force initialize new_terms_key
stable
Pablo Ruiz Múzquiz 2018-05-24 17:20:28 +02:00 committed by GitHub
parent 858917e700 8c68f05101
commit e99b62592c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/modules/components/terms-announcement/terms-announcement.directive.coffee
View File

@ -23,7 +23,7 @@
### ###
TermsAnnouncementDirective = (TermsAnnouncementService, $repo, $auth, $config) -> TermsAnnouncementDirective = (TermsAnnouncementService, $repo, $auth, $config, $model) ->
link = (scope, el, attrs) -> link = (scope, el, attrs) ->
scope.privacyPolicyUrl = $config.get("privacyPolicyUrl") scope.privacyPolicyUrl = $config.get("privacyPolicyUrl")
scope.termsOfServiceUrl = $config.get("termsOfServiceUrl") scope.termsOfServiceUrl = $config.get("termsOfServiceUrl")
@ -38,10 +38,18 @@ TermsAnnouncementDirective = (TermsAnnouncementService, $repo, $auth, $config) -
TermsAnnouncementService.open = false TermsAnnouncementService.open = false
user = $auth.getUser() user = $auth.getUser()
# We need to force initialization of rootscope user if localstorage user
# doesn't have the 'read_new_terms' key
if user.read_new_terms == undefined
userData = user.getAttrs()
userData.read_new_terms = false
user = $model.make_model("users", userData)
user.read_new_terms = true
onSuccess = (data) -> onSuccess = (data) ->
$auth.setUser(data) $auth.setUser(data)
user.read_new_terms = true
$repo.save(user).then(onSuccess) $repo.save(user).then(onSuccess)
Object.defineProperties(this, { Object.defineProperties(this, {
@ -57,7 +65,8 @@ TermsAnnouncementDirective.$inject = [
"tgTermsAnnouncementService", "tgTermsAnnouncementService",
"$tgRepo", "$tgRepo",
"$tgAuth", "$tgAuth",
"$tgConfig" "$tgConfig",
"$tgModel"
] ]
angular.module("taigaComponents") angular.module("taigaComponents")