diff options
| author | René Gieling <github@dartcafe.de> | 2020-01-23 01:40:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 01:40:21 +0300 |
| commit | ec1c9b0b0d23a815dd962ecb4a95d88df1a329fa (patch) | |
| tree | 3be6cc5b34189c89f2dec0d3ef2857e90bd1ab6f | |
| parent | f7e81b01ed5ebc4523d9c5c67e1551d13304a200 (diff) | |
| parent | 94fca9cf9825c01954ea2b54d8e0a9d7a76a0eae (diff) | |
Merge pull request #769 from nextcloud/fixSharesv1.1.2-RC
fix route
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | appinfo/info.xml | 2 | ||||
| -rw-r--r-- | lib/Controller/ShareController.php | 1 | ||||
| -rw-r--r-- | lib/Service/MailService.php | 8 | ||||
| -rw-r--r-- | package.json | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b1adf54c..d45a76b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ # Changelog All notable changes to this project will be documented in this file. -## [1.1.2] - tbd +## [1.1.3] - tbd - - appstore release (no changes to 1.1.1) + - appstore release (no changes to 1.1.2) -## [1.1.1] - 2020-01-22 (pre-release) +## [1.1.2] - 2020-01-22 (pre-release) - autoFocus poll title in creation dialog (#757) - only count current user, if he actually voted (#759) diff --git a/appinfo/info.xml b/appinfo/info.xml index 600795c6..76582bb1 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,7 +5,7 @@ <name>Polls</name> <summary>A polls app, similar to doodle/dudle with the possibility to restrict access.</summary> <description>A polls app, similar to doodle/dudle with the possibility to restrict access (members, certain groups/users, hidden and public).</description> - <version>1.1.1</version> + <version>1.1.2</version> <licence>agpl</licence> <author>Vinzenz Rosenkranz</author> <author>René Gieling</author> diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php index 48b043e6..e24ac535 100644 --- a/lib/Controller/ShareController.php +++ b/lib/Controller/ShareController.php @@ -154,6 +154,7 @@ class ShareController extends Controller { $newShare->setPollId($share['pollId']); $newShare->setUserId($share['userId']); $newShare->setUserEmail(isset($share['userEmail']) ? $share['userEmail'] : ''); + $newShare->setUser(''); $newShare->setToken(\OC::$server->getSecureRandom()->generate( 16, ISecureRandom::CHAR_DIGITS . diff --git a/lib/Service/MailService.php b/lib/Service/MailService.php index 64f51a46..fbef4935 100644 --- a/lib/Service/MailService.php +++ b/lib/Service/MailService.php @@ -160,7 +160,7 @@ class MailService { 'language' => $this->config->getUserValue($share->getUserId(), 'core', 'lang'), 'link' => $this->urlGenerator->getAbsoluteURL( $this->urlGenerator->linkToRoute( - 'polls.page.polls', array('pollId' => $share->getPollId()) + 'polls.page.polls', array('id' => $share->getPollId()) ) ) ); @@ -177,7 +177,7 @@ class MailService { 'language' => $defaultLang, 'link' => $this->urlGenerator->getAbsoluteURL( $this->urlGenerator->linkToRoute( - 'polls.page.polls', array('pollId' => $share->getPollId()) + 'polls.page.polls', array('id' => $share->getPollId()) ) ) ); @@ -215,7 +215,7 @@ class MailService { 'language' => $this->config->getUserValue($share->getUserId(), 'core', 'lang'), 'link' => $this->urlGenerator->getAbsoluteURL( $this->urlGenerator->linkToRoute( - 'polls.page.polls', array('pollId' => $share->getPollId()) + 'polls.page.polls', array('id' => $share->getPollId()) ) ) ); @@ -308,7 +308,7 @@ class MailService { $url = $this->urlGenerator->getAbsoluteURL( $this->urlGenerator->linkToRoute( 'polls.page.polls', - array('pollId' => $subscription->getPollId()) + array('id' => $subscription->getPollId()) ) ); diff --git a/package.json b/package.json index 0a99b3d4..c8b6e3da 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "polls", "description": "Polls app for nextcloud", - "version": "1.1.1", + "version": "1.1.2", "authors": [ { "name": "Vinzenz Rosenkranz", |