Skip to content

Commit

Permalink
#1432 Allow user without manageShare to see the tasks and observables…
Browse files Browse the repository at this point in the history
… shares without allowing them to add new shares
  • Loading branch information
nadouani committed Jul 16, 2020
1 parent 0c43f15 commit 73ee961
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion frontend/app/views/partials/case/case.sharing.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="row mb-s" if-permission="manageCase" allowed="{{userPermissions}}">
<div class="row mb-s" if-permission="manageShare" allowed="{{userPermissions}}">
<div class="col-md-12">
<div class="btn-toolbar" role="toolbar">
<div class="btn-group">
Expand Down
8 changes: 5 additions & 3 deletions frontend/app/views/partials/case/case.tasks.item.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ <h4 class="mb-xs text-primary">
Basic Information

<div class="task-actions pull-right" if-permission="manageTask" allowed="{{userPermissions}}">
<span if-permission="manageShare" allowed="{{userPermissions}}">
<!-- <span if-permission="manageShare" allowed="{{userPermissions}}"> -->
<span>
<a href ng-click="scrollTo('#task-sharings')">
<span class="mr-xxs action-button">
<i class="fa fa-users"></i> Sharing
Expand Down Expand Up @@ -220,9 +221,10 @@ <h4 class="vpad10 text-primary">Task logs</h4>
<psearch control="logs"></psearch>
</div>

<div class="col-md-12" id="task-sharings" if-permission="manageShare" allowed="{{userPermissions}}">
<!-- <div class="col-md-12" id="task-sharings" if-permission="manageShare" allowed="{{userPermissions}}"> -->
<div class="col-md-12" id="task-sharings">
<h4 class="vpad10 text-primary">Task sharing</h4>
<div class="btn-toolbar" role="toolbar">
<div class="btn-toolbar" role="toolbar" if-permission="manageShare" allowed="{{userPermissions}}">
<div class="btn-group">
<button class="btn btn-sm btn-primary" ng-click="addTaskShare()">
<i class="fa fa-plus"></i>
Expand Down
6 changes: 3 additions & 3 deletions frontend/app/views/partials/observables/details/sharing.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="row">
<div class="col-md-12" id="observable-sharings" if-permission="manageShare" allowed="{{userPermissions}}">
<div class="col-md-12" id="observable-sharings">
<h4 class="vpad10 text-primary">Sharing</h4>
<div class="btn-toolbar" role="toolbar">
<div class="btn-toolbar" role="toolbar" if-permission="manageShare" allowed="{{userPermissions}}">
<div class="btn-group">
<button class="btn btn-sm btn-primary" ng-click="addTaskShare()">
<i class="fa fa-plus"></i>
Expand All @@ -14,7 +14,7 @@ <h4 class="vpad10 text-primary">Sharing</h4>
shares="shares"
read-only="true"
on-delete="removeShare(share)"
permissions="userPermissions"
permissions="userPermissions"
></sharing-list>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion frontend/app/views/partials/observables/details/summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<h4 class="vpad10 text-primary">
Metadata
<div class="task-actions pull-right">
<span if-permission="manageShare" allowed="{{userPermissions}}">
<!-- <span if-permission="manageShare" allowed="{{userPermissions}}"> -->
<span>
<a href ng-click="scrollTo('#observable-sharings')">
<span class="mr-xxs action-button">
<i class="fa fa-users"></i> Sharing
Expand Down

0 comments on commit 73ee961

Please sign in to comment.