From fcb299790f97b12833bc5fcd16f0e4bffedd38e9 Mon Sep 17 00:00:00 2001 From: sqlr Date: Tue, 10 Jan 2017 12:15:30 +0100 Subject: [PATCH 1/3] Fix typo --- module/Application/language/nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/Application/language/nl.po b/module/Application/language/nl.po index 0a5c510dd0..887036a895 100644 --- a/module/Application/language/nl.po +++ b/module/Application/language/nl.po @@ -2365,7 +2365,7 @@ msgstr "" #: module/Decision/view/decision/member/index.phtml:8 msgid "Personal" -msgstr "Persoonlijjk" +msgstr "Persoonlijk" #: module/Decision/view/decision/member/index.phtml:13 msgid "Profile" From 8952b7d63c20f6d7c63798bde7c4354b475052b4 Mon Sep 17 00:00:00 2001 From: sqlr Date: Tue, 10 Jan 2017 17:53:54 +0100 Subject: [PATCH 2/3] Add files via upload --- module/Application/language/nl.mo | Bin 54534 -> 50473 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/module/Application/language/nl.mo b/module/Application/language/nl.mo index f3ef826a4f215ab17c8c99ed7665daa60048a5df..f1d2d6f6806f6a4af9c6ac998c24950d411c6ae4 100644 GIT binary patch delta 11124 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 ap48($+%q*}&3${86|8Q$r`49rN&f?yd(e#l delta 15217 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 From 5cff8dbf102c59493152a16385d8962c760e43ad Mon Sep 17 00:00:00 2001 From: Martijn Struijs Date: Tue, 10 Jan 2017 18:40:55 +0100 Subject: [PATCH 3/3] fix permission chec --- .../Activity/src/Activity/Controller/ActivityController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/Activity/src/Activity/Controller/ActivityController.php b/module/Activity/src/Activity/Controller/ActivityController.php index 45888be9fe..c4bd2064a1 100644 --- a/module/Activity/src/Activity/Controller/ActivityController.php +++ b/module/Activity/src/Activity/Controller/ActivityController.php @@ -43,7 +43,7 @@ public function viewAction() $activity = $queryService->getActivity($id); $translatedActivity = $translatorService->getTranslatedActivity($activity, $langSession->lang); - $identity = $this->getServiceLocator()->get('user_service_user')->getIdentity(); + $identity = $this->getServiceLocator()->get('user_role'); /** @var Signup $signupService */ $signupService = $this->getServiceLocator()->get('activity_service_signup'); $isAllowedToSubscribe = $signupService->isAllowedToSubscribe(); @@ -56,8 +56,8 @@ public function viewAction() $subscriptionDeadLinePassed = $activity->getSubscriptionDeadline() < new \DateTime(); $result = [ 'activity' => $translatedActivity, - 'signupOpen' => $activity->getCanSignUp() && - !$subscriptionDeadLinePassed && + 'signupOpen' => $activity->getCanSignUp() && + !$subscriptionDeadLinePassed && $activity->getStatus() === Activity::STATUS_APPROVED, 'isAllowedToSubscribe' => $isAllowedToSubscribe, 'isSignedUp' => $isAllowedToSubscribe && $signupService->isSignedUp($translatedActivity, $identity->getMember()),