coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

few fixed for Character permissions

Browse source
This commit is contained in:
coderkun 2014-04-17 00:27:59 +02:00
commit 437353ca81
7 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
controllers/CharactersController.inc
View file

@ -158,6 +158,16 @@
// Get seminary
$seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl);
// Check for already existing Character
try {
$this->Characters->getCharacterForUserAndSeminary($this->Auth->getUserId(), $seminary['id']);
throw new \nre\exceptions\AccessDeniedException();
}
catch(\nre\exceptions\IdNotFoundException $e) {
// The should be the case
}
// Character types
$types = $this->Charactertypes->getCharacterTypesForSeminary($seminary['id']);

1
controllers/MenuController.inc
View file

@ -35,6 +35,7 @@
// Set userdata
$this->set('loggedUser', IntermediateController::$user);
$this->set('loggedCharacter', SeminaryRoleController::$character);
$this->set('loggedSeminary', SeminaryRoleController::$seminary);
}

6
controllers/SeminarymenuController.inc
View file

@ -18,7 +18,7 @@
*
* @author Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
*/
class SeminarymenuController extends \hhu\z\Controller
class SeminarymenuController extends \hhu\z\controllers\SeminaryRoleController
{
@ -35,8 +35,8 @@
parent::preFilter($request, $response);
// Set userdata
$this->set('loggedUser', IntermediateController::$user);
$this->set('loggedSeminary', SeminaryRoleController::$seminary);
$this->set('loggedUser', self::$user);
$this->set('loggedSeminary', self::$seminary);
}