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 aa7617eaf99c9b9f9f47cab7c359f2aacbc0d6fc Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 10 18:44:06 2014 +0100 add information when question is not available --- coselmar-ui/src/main/webapp/views/questions/question.html | 8 ++++++-- .../webapp/views/questions/viewRestrictedQuestion.html | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/coselmar-ui/src/main/webapp/views/questions/question.html b/coselmar-ui/src/main/webapp/views/questions/question.html index dcf238c..3093209 100644 --- a/coselmar-ui/src/main/webapp/views/questions/question.html +++ b/coselmar-ui/src/main/webapp/views/questions/question.html @@ -2,13 +2,17 @@ <div class="page-header" style="margin: 0"> <h2> {{question.title}} - <a class="btn btn-action btn-edit pull-right" ng-click="edit()" ng-if="editMode != true"> + <a class="btn btn-action btn-edit pull-right" ng-click="edit()" ng-if="editMode != true && currentUser.role == 'SUPERVISOR'"> <span class="fa fa-edit" aria-hidden="true"></span>Edit </a> </h2> </div> - <div style="padding-bottom: 50px" ng-if="editMode == false"> + <div style="padding-bottom: 50px" ng-if="editMode == false && question.isRestricted"> + <div ng-include="src='views/questions/viewRestrictedQuestion.html'"></div> + </div> + + <div style="padding-bottom: 50px" ng-if="editMode == false && !question.isRestricted"> <div ng-include="src='views/questions/viewquestion.html'"></div> <div ng-include="src='views/questions/newDocumentsPart.html'" ng-if="isCurrentParticipant"></div> </div> diff --git a/coselmar-ui/src/main/webapp/views/questions/viewRestrictedQuestion.html b/coselmar-ui/src/main/webapp/views/questions/viewRestrictedQuestion.html new file mode 100644 index 0000000..f48f801 --- /dev/null +++ b/coselmar-ui/src/main/webapp/views/questions/viewRestrictedQuestion.html @@ -0,0 +1,15 @@ + +<div class=""> + + Cette question n'est pas disponible à la consultation. + + </div> + + <!-- TODO ymartel 20141208 : manage parents and children + <div class="form-group col-md-12"> + <div class="col-md-6">TODO Parents</div> + <div class="col-md-6">TODO Children</div> + </div> + --> + +</div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.