Skip to content

Commit 4750167

Browse files
committed
+ project controller with annotations
+ project events (create, view, remove) + less ajax
1 parent b118f2f commit 4750167

39 files changed

+1564
-543
lines changed

src/XRayLP/LearningCenterBundle/Controller/CatalogController.php

+30-7
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,50 @@
1414
use Symfony\Component\HttpFoundation\Response;
1515
use App\XRayLP\LearningCenterBundle\Entity\Member;
1616
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
17+
use Symfony\Component\Translation\TranslatorInterface;
1718

1819
class CatalogController extends Controller
1920
{
21+
22+
private $translator;
23+
24+
public function __construct(TranslatorInterface $translator)
25+
{
26+
$this->translator = $translator;
27+
}
28+
29+
/**
30+
* Catalog Timeline shows Shared Files for the Member
31+
*
32+
* TODO: Delete one's own Shares
33+
*
34+
* @param Catalog $catalog
35+
* @param TokenStorageInterface $tokenStorage
36+
* @return RedirectResponse|Response
37+
*/
2038
public function mainAction(Catalog $catalog, TokenStorageInterface $tokenStorage)
2139
{
2240
//Check if the User isn't granted
23-
if (\System::getContainer()->get('security.authorization_checker')->isGranted('ROLE_MEMBER'))
41+
if ($this->isGranted('ROLE_MEMBER'))
2442
{
25-
26-
//$files = \System::getContainer()->get('learningcenter.files')->createCatalogTimeline($User);
27-
2843
//creates the catalog object
2944
$catalog->setMember($this->getDoctrine()->getRepository(Member::class)->findOneById($tokenStorage->getToken()->getUser()->id));
3045
$files = $catalog->loadFiles();
31-
$errors = $catalog->getErrors();
32-
3346

47+
//no shared files exist
48+
if (count($files) === 0){
49+
$this->get('session')->getFlashBag()->add(
50+
'notice',
51+
array(
52+
'alert' => 'danger',
53+
'title' => '',
54+
'message' => $this->translator->trans('catalog.no.files')
55+
)
56+
);
57+
}
3458

3559
$rendered = $this->renderView('@LearningCenter/modules/catalog_timeline.html.twig', array(
3660
'files' => $files,
37-
'errors' => $errors
3861
));
3962
return new Response($rendered);
4063

src/XRayLP/LearningCenterBundle/Controller/LearningCenterController.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ class LearningCenterController extends Controller
1919
{
2020

2121
/**
22-
* SOON: Dashboard
22+
* Main Root Controller, where User is redirected to after login.
23+
*
24+
* TODO: Dashboard
2325
*
2426
* @return RedirectResponse|Response
2527
*/
2628
public function mainAction()
2729
{
2830
//Check if the User isn't granted
29-
if ($this->get('security.authorization_checker')->isGranted('ROLE_MEMBER'))
31+
if ($this->isGranted('ROLE_MEMBER'))
3032
{
3133

3234
$member = $this->getDoctrine()->getRepository(Member::class)->findOneBy(array('id' => $this->getUser()->id));

src/XRayLP/LearningCenterBundle/Controller/MemberController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public function getMembers(Request $request)
152152
$members = $em->findAllLike($phrase);
153153
}
154154
$members = $em->findOneById(1);
155-
dump($members);
155+
156156
if ($members) {
157157
$encoders = [
158158
new JsonEncoder(),

0 commit comments

Comments
 (0)