This is an automated email from the git hooks/post-receive script. New commit to branch feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit c010c402682b3c061137a80cb3ec2ae74ebf1794 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 25 08:53:45 2017 +0100 correction de la récupération de l'utilisateur --- .../src/main/web/tag/poll/PollComments.tag | 26 ++++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/PollComments.tag b/pollen-ui-riot-js/src/main/web/tag/poll/PollComments.tag index 6da439f..7e8862c 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/PollComments.tag +++ b/pollen-ui-riot-js/src/main/web/tag/poll/PollComments.tag @@ -90,13 +90,19 @@ require('./CommentPopup.tag'); this.openAddComment = () => { let comment = { - text: '', - authorName: '' + authorName: '', + text: '' }; if (session.isConnected()) { - comment.authorName = session.user.name; + session.getUser().then(user => { + comment.authorName = user.name; + this.refs.commentPopup.openForCreate(this.pollId, comment, this.addComment); + } + ); + } else { + this.refs.commentPopup.openForCreate(this.pollId, comment, this.addComment); } - this.refs.commentPopup.openForCreate(this.pollId, comment, this.addComment); + }; this.addComment = (comment) => { @@ -182,12 +188,15 @@ require('./CommentPopup.tag'); .comment-container { width: 800px; + display: flex; + flex-direction: column; + justify-content: flex-start; } .comment-header { width: 360px; - flex-grow: 1; display: flex; + flex-direction: row; justify-content: flex-end; } @@ -201,12 +210,15 @@ require('./CommentPopup.tag'); .comment-header-actions > a { padding-left: 5px; } + .legend { width: 800px; } - .actions { - margin-top: 10px; + div.actions { + /*margin-top: 10px;*/ + display: flex; + justify-content: flex-start; } tr > td:first-child { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.