AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression for subtask restriction

Browse Source
This commit is contained in:
Frederic Guillot
2015-12-12 16:52:12 -05:00
parent b834f5475c
commit dc40675f37
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helper/Subtask.php
View File

@@ -25,7 +25,7 @@ class Subtask extends \Kanboard\Core\Base
return trim($this->template->render('subtask/icons', array('subtask' => $subtask))) . $this->helper->e($subtask['title']); return trim($this->template->render('subtask/icons', array('subtask' => $subtask))) . $this->helper->e($subtask['title']);
} }
if ($subtask['status'] == 0 && isset($this->sessionStorage->hasSubtaskInProgress) && $this->sessionStorage->hasSubtaskInProgress === true) { if ($subtask['status'] == 0 && isset($this->sessionStorage->hasSubtaskInProgress) && $this->sessionStorage->hasSubtaskInProgress) {
return $this->helper->url->link( return $this->helper->url->link(
trim($this->template->render('subtask/icons', array('subtask' => $subtask))) . $this->helper->e($subtask['title']), trim($this->template->render('subtask/icons', array('subtask' => $subtask))) . $this->helper->e($subtask['title']),
'subtask', 'subtask',

2
app/Subscriber/AuthSubscriber.php
View File

@@ -57,8 +57,6 @@ class AuthSubscriber extends Base implements EventSubscriberInterface
$this->userSession->validatePostAuthentication(); $this->userSession->validatePostAuthentication();
} }
$this->sessionStorage->hasSubtaskInProgress = $this->subtask->hasSubtaskInProgress($this->userSession->getId());
if (isset($this->sessionStorage->hasRememberMe) && $this->sessionStorage->hasRememberMe) { if (isset($this->sessionStorage->hasRememberMe) && $this->sessionStorage->hasRememberMe) {
$session = $this->rememberMeSession->create($this->userSession->getId(), $ipAddress, $userAgent); $session = $this->rememberMeSession->create($this->userSession->getId(), $ipAddress, $userAgent);
$this->rememberMeCookie->write($session['token'], $session['sequence'], $session['expiration']); $this->rememberMeCookie->write($session['token'], $session['sequence'], $session['expiration']);

1
app/Subscriber/BootstrapSubscriber.php
View File

@@ -17,6 +17,7 @@ class BootstrapSubscriber extends \Kanboard\Core\Base implements EventSubscriber
{ {
$this->config->setupTranslations(); $this->config->setupTranslations();
$this->config->setupTimezone(); $this->config->setupTimezone();
$this->sessionStorage->hasSubtaskInProgress = $this->subtask->hasSubtaskInProgress($this->userSession->getId());
} }
public function __destruct() public function __destruct()