branch develop updated (a798621 -> 1e7a752)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from a798621 Corrections graphiques new 1e7a752 fixes #7949 Add way to delete contributor The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1e7a752adda31ba7d66c2c58ba75defb70d7f1ba Author: Yannick Martel <martel@©odelutin.com> Date: Mon Feb 1 11:39:45 2016 +0100 fixes #7949 Add way to delete contributor Summary of changes: .../coselmar/services/v1/QuestionsWebService.java | 8 ++++++++ coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 7 +++++++ .../src/main/webapp/views/questions/editquestion.html | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 1e7a752adda31ba7d66c2c58ba75defb70d7f1ba Author: Yannick Martel <martel@©odelutin.com> Date: Mon Feb 1 11:39:45 2016 +0100 fixes #7949 Add way to delete contributor --- .../coselmar/services/v1/QuestionsWebService.java | 8 ++++++++ coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 7 +++++++ .../src/main/webapp/views/questions/editquestion.html | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java index 4439b3a..f5a7ca0 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java @@ -649,6 +649,14 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { questionEntity.addAllClients(clientEntities); } + // Retrieve the contributors + Set<UserBean> contributors = question.getContributors(); + questionEntity.clearContributors(); + if (contributors != null && !contributors.isEmpty()) { + Set<CoselmarUser> contributorEntities = retrieveUsers(contributors); + questionEntity.addAllContributors(contributorEntities); + } + // For participants, should create a dedicated group, // that could be used to restrict documents access Set<UserBean> participants = question.getParticipants(); diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 7156265..5e97aef 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -1420,6 +1420,13 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam } } + $scope.removeContributor = function(contributor) { + var position = $scope.question.contributors.indexOf(contributor); + if (contributor && position != -1) { + $scope.question.contributors.splice(position, 1); + } + } + // Modals part for documents $scope.modalSearchDocuments = function (documentList) { diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 38e1958..6d39e51 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -344,6 +344,24 @@ <!-- End Line with External Experts and Supervisor --> + <!-- Line with Contributors : allow to remove them --> + + <div class="form-group row" ng-if="question.contributors"> + + <label class="col-md-2 control-label">{{ 'question.metadata.contributors' | translate }}</label> + + <div class="col-md-10"> + <span ng-repeat="contributor in question.contributors" class="tag" aria-hidden="true"> + {{contributor.firstName}} {{contributor.name}} ({{contributor.organization}}) + <button type="button" class="close" title="remove" ng-click="removeContributor(contributor);"> + × + </button> + </span> + </div> + </div> + + <!-- End line with Contributors --> + <!-- Line with Related Links --> <div class="form-group" > -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm