Skip to content

Commit

Permalink
Fix vote by email (#3600)
Browse files Browse the repository at this point in the history
* Fix vote by email

* Another solution?

* Clear params after vote modal launched
  • Loading branch information
HSalmon authored and gdpelican committed Aug 10, 2016
1 parent 9388f85 commit 8305663
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .env.test
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CANONICAL_HOST=localhost
CANONICAL_PORT=3000
SMTP_DOMAIN=loomio.example.org
REPLY_DOMAIN=reply.loomio.example.org
REPLY_HOSTNAME=reply.loomio.example.org
SUPPORT_EMAIL="support <support@loomio.example.org>"
FLASH_TIMEOUT_SHORT=100000
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ angular.module('loomioApp').controller 'ThreadPageController', ($scope, $routePa

@requestedProposalKey = $routeParams.proposal or $location.search().proposal
@requestedCommentId = parseInt($routeParams.comment or $location.search().comment)
$location.url($location.path())

handleCommentHash = do ->
if match = $location.hash().match /comment-(\d+)/
Expand All @@ -14,6 +13,7 @@ angular.module('loomioApp').controller 'ThreadPageController', ($scope, $routePa
ScrollService.scrollTo @elementToFocus(), 150
$rootScope.$broadcast 'triggerVoteForm', $location.search().position if @openVoteModal()
(ModalService.open ProposalOutcomeForm, proposal: => @proposal) if @openOutcomeModal()
$location.url($location.path())

@openVoteModal = ->
$location.search().position and
Expand Down

0 comments on commit 8305663

Please sign in to comment.