This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 7417753883bf0b473958b819bd768f5959a2e253 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Jan 14 11:54:04 2016 +0100 Affichage des virgules dans les ng-repeat des themes et mot clés --- coselmar-ui/src/main/webapp/views/documents/documents.html | 2 +- coselmar-ui/src/main/webapp/views/documents/viewDocument.html | 2 +- coselmar-ui/src/main/webapp/views/home.html | 2 +- coselmar-ui/src/main/webapp/views/questions/questions.html | 2 +- coselmar-ui/src/main/webapp/views/questions/viewquestion.html | 4 ++-- coselmar-ui/src/main/webapp/views/referential/referential.html | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/coselmar-ui/src/main/webapp/views/documents/documents.html b/coselmar-ui/src/main/webapp/views/documents/documents.html index 5578226..1580631 100644 --- a/coselmar-ui/src/main/webapp/views/documents/documents.html +++ b/coselmar-ui/src/main/webapp/views/documents/documents.html @@ -49,7 +49,7 @@ <td><a href="#/documents/{{document.id}}">{{document.name}}</a></td> <td>{{document.authors}}</td> <td>{{document.privacy}}</td> - <td><span ng-repeat="keyword in document.keywords">{{keyword}} ,</span></td> + <td><span ng-repeat="keyword in document.keywords">{{keyword}}<span ng-if="!$last">, </span></span></td> <td>{{document.ownerName}}</td> <td>{{document.depositDate | date:'mediumDate'}}</td> <td class="text-center">{{document.nbRelatedQuestions || 0}}</td> diff --git a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html index 2558437..8a9b192 100644 --- a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html @@ -86,7 +86,7 @@ <span class="status-{{question.status|lowercase}}" title="{{question.status| translate}}"></span> <a href="#/questions/{{question.id}}" class="paddingLeft10" target="_blank">{{question.title}}</a> </td> - <td><span ng-repeat="theme in question.themes">{{theme}}, </span></td> + <td><span ng-repeat="theme in question.themes">{{theme}}<span ng-if="!$last">, </span> </span></td> </tr> </tbody> </table> diff --git a/coselmar-ui/src/main/webapp/views/home.html b/coselmar-ui/src/main/webapp/views/home.html index 39c0486..02861a7 100644 --- a/coselmar-ui/src/main/webapp/views/home.html +++ b/coselmar-ui/src/main/webapp/views/home.html @@ -51,7 +51,7 @@ <td>{{question.submissionDate | date:'mediumDate'}}</td> - <td><span ng-repeat="theme in question.themes">{{theme}}, </span></td> + <td><span ng-repeat="theme in question.themes">{{theme}}<span ng-if="!$last">, </span></span></td> <td>{{question.deadline | date:'mediumDate'}}</td> diff --git a/coselmar-ui/src/main/webapp/views/questions/questions.html b/coselmar-ui/src/main/webapp/views/questions/questions.html index a812631..fe77ca4 100644 --- a/coselmar-ui/src/main/webapp/views/questions/questions.html +++ b/coselmar-ui/src/main/webapp/views/questions/questions.html @@ -56,7 +56,7 @@ <td>{{question.submissionDate | date:'mediumDate'}}</td> - <td><span ng-repeat="theme in question.themes">{{theme}}, </span></td> + <td><span ng-repeat="theme in question.themes">{{theme}}<span ng-if="!$last">, </span> </span></td> <td>{{question.deadline | date:'mediumDate'}}</td> diff --git a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html index bd3ca33..0e4a949 100644 --- a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html @@ -53,7 +53,7 @@ <tr ng-repeat="document in question.relatedDocuments | orderBy:'depositDate':true"> <td><a href="#/documents/{{document.id}}" target="_blank">{{document.name}}</a></td> <td>{{document.authors}}</td> - <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> + <td><span ng-repeat="keyword in document.keywords">{{keyword}}<span ng-if="!$last">, </span></span></td> <td>{{document.ownerName}}</td> <td>{{document.depositDate | date:'mediumDate'}}</td> </tr> @@ -86,7 +86,7 @@ <tr ng-repeat="document in question.closingDocuments | orderBy:'depositDate':true"> <td><a href="#/documents/{{document.id}}" target="_blank">{{document.name}}</a></td> <td>{{document.authors}}</td> - <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> + <td><span ng-repeat="keyword in document.keywords">{{keyword}}<span ng-if="!$last">, </span> </span></td> <td>{{document.ownerName}}</td> <td>{{document.depositDate | date:'mediumDate'}}</td> </tr> diff --git a/coselmar-ui/src/main/webapp/views/referential/referential.html b/coselmar-ui/src/main/webapp/views/referential/referential.html index b19fdf9..bf27b19 100644 --- a/coselmar-ui/src/main/webapp/views/referential/referential.html +++ b/coselmar-ui/src/main/webapp/views/referential/referential.html @@ -92,7 +92,7 @@ </td> <td>{{document.depositDate | date:'mediumDate'}}</td> <td>{{document.authors}}</td> - <td><span ng-repeat="keyword in document.keywords">{{keyword}} ,</span></td> + <td><span ng-repeat="keyword in document.keywords">{{keyword}}<span ng-if="!$last">, </span></span></td> </tr> </tbody> </table> @@ -128,7 +128,7 @@ tooltip-placement="bottom" tooltip-html-unsafe="{{question.summary}}">{{question.title}}</a> </td> <td>{{question.submissionDate | date:'mediumDate'}}</td> - <td><span ng-repeat="theme in question.themes">{{theme}}, </span></td> + <td><span ng-repeat="theme in question.themes">{{theme}}<span ng-if="!$last">, </span> </span></td> <td><span class="status-{{question.status|lowercase}}"></span>{{question.status | translate}}</td> </tr> </tbody> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.