raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-19 04:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure email validation link returns to /register paths properly

Browse Source
This commit is contained in:
Matt-Yorkley
2018-03-03 15:42:06 +00:00
committed by Maikel Linke
parent d7a3c50bd5
commit e8bc87e62b
5 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
View File

@@ -20,8 +20,8 @@ Darkswarm.controller "LoginCtrl", ($scope, $timeout, $location, $http, $window,
$scope.errors = t('devise.confirmations.failed_to_send')
$timeout ->
if angular.isDefined($location.search()['confirmation'])
if $location.search()['confirmation'] == 'confirmed'
if angular.isDefined($location.search()['validation'])
if $location.search()['validation'] == 'confirmed'
$scope.messages = t('devise.confirmations.confirmed')
if $location.search()['confirmation'] == 'not_confirmed'
if $location.search()['validation'] == 'not_confirmed'
$scope.errors = t('devise.confirmations.not_confirmed')

5
app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
View File

@@ -7,7 +7,10 @@ Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location, Redir
if $location.path() in ["/login", "/signup", "/forgot"] && location.pathname isnt '/register/auth'
@open $location.path()
else if location.pathname is '/register/auth'
@open '/signup', 'registration_authentication.html'
if angular.isDefined($location.search()['validation'])
@open '/login', 'registration_authentication.html'
else
@open '/signup', 'registration_authentication.html'
open: (path = false, template = 'authentication.html') =>
@modalInstance = $modal.open