Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
potage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mathieu
potage
Commits
487e6156
Commit
487e6156
authored
Sep 05, 2018
by
Mat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hop
parent
8d840928
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
src/PotageBundle/Controller/MembreController.php
src/PotageBundle/Controller/MembreController.php
+8
-7
src/PotageBundle/Resources/views/Membre/today.html.twig
src/PotageBundle/Resources/views/Membre/today.html.twig
+1
-1
src/PotageBundle/Services/Newsletter.php
src/PotageBundle/Services/Newsletter.php
+1
-0
No files found.
src/PotageBundle/Controller/MembreController.php
View file @
487e6156
...
...
@@ -17,7 +17,9 @@ class MembreController extends MasterController
/**
* La page today affiche le(s) offres disponibles pour un user
* identifié sur base du token passé dans le lien
* TODO les offres en cours, pour un utilisateur connecté
*
* Affiche l'offre qui est indiquée dans le token
* ou sans token, la liste des offres du moment pour cet utilisateur
*
* @param Request $request
* @param LettreToken $lettreToken
...
...
@@ -35,9 +37,6 @@ class MembreController extends MasterController
if
(
$request
->
query
->
has
(
'token'
))
{
/**
* Debug token
*/
$token
=
$request
->
query
->
get
(
'token'
);
$tokenInside
=
$lettreToken
->
decodePotageUserToken
(
$token
);
...
...
@@ -47,18 +46,18 @@ class MembreController extends MasterController
}
else
{
$offreOne
=
null
;
$token
=
null
;
$tokenInside
=
null
;
$offreOne
=
null
;
}
return
$this
->
render
(
'@Potage/Membre/today.html.twig'
,
array
(
'user'
=>
$user
,
'groupes'
=>
$groupes
,
'offreOne'
=>
$offreOne
,
'token'
=>
$token
,
'tokenInside'
=>
$tokenInside
,
'offreOne'
=>
$offreOne
,
));
}
...
...
@@ -66,6 +65,8 @@ class MembreController extends MasterController
/**
* Lorsqu'on pointe explicitement la référence de l'offre
*
* @param $offre_ref
* @return \Symfony\Component\HttpFoundation\Response
* @throws \Doctrine\ORM\NonUniqueResultException
...
...
@@ -89,9 +90,9 @@ class MembreController extends MasterController
return
$this
->
render
(
'@Potage/Membre/today.html.twig'
,
array
(
'user'
=>
$user
,
'groupes'
=>
$groupes
,
'offreOne'
=>
$offreOne
,
'token'
=>
null
,
'tokenInside'
=>
null
,
'offreOne'
=>
$offreOne
,
));
}
...
...
src/PotageBundle/Resources/views/Membre/today.html.twig
View file @
487e6156
{%
extends
'@Potage/layout.html.twig'
%}
{%
block
title
%}
Aujourd'hui
sur Potage !
Cette semaine
sur Potage !
{%
endblock
%}
{%
block
searchbar
%}{%
endblock
searchbar
%}
...
...
src/PotageBundle/Services/Newsletter.php
View file @
487e6156
...
...
@@ -55,6 +55,7 @@ class Newsletter
*/
private
function
getBody
(
Lettre
$lettre
)
{
$groupe
=
array
(
'nom'
=>
$lettre
->
getGroupe
()
->
getNom
(),
'slug'
=>
$lettre
->
getGroupe
()
->
getSlug
(),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment