#1437 Remove the isOwner extra data

TheHive-Project · Jul 17, 2020 · d9b4f49 · d9b4f49
1 parent ef5f4e3
commit d9b4f49
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 20 deletions.
diff --git a/frontend/app/scripts/controllers/case/CaseObservablesCtrl.js b/frontend/app/scripts/controllers/case/CaseObservablesCtrl.js
@@ -74,7 +74,8 @@
                     sort: $scope.filtering.context.sort,
                     pageSize: $scope.filtering.context.pageSize,
                     filter: $scope.filtering.buildQuery(),
-                    extraData: ['seen', 'permissions', 'isOwner', 'shareCount'],
+                    extraData: ['seen', 'permissions', 'shareCount'],
+                    // extraData: ['seen', 'permissions', 'isOwner', 'shareCount'],
                     operations: [
                         {'_name': 'getCase', 'idOrName': $scope.caseId},
                         {'_name': 'observables'}

diff --git a/frontend/app/scripts/controllers/case/CaseTasksCtrl.js b/frontend/app/scripts/controllers/case/CaseTasksCtrl.js
@@ -61,7 +61,8 @@
                     {'_name': 'getCase', "idOrName": $scope.caseId},
                     {'_name': 'tasks'}
                 ],
-                extraData: ['isOwner', 'shareCount'],
+                extraData: ['shareCount'],
+                //extraData: ['isOwner', 'shareCount'],
                 onUpdate: function() {
                     $scope.buildTaskGroups($scope.tasks.values);
                 }

diff --git a/frontend/app/views/partials/case/case.tasks.html b/frontend/app/views/partials/case/case.tasks.html
@@ -94,10 +94,10 @@ <h4>
                     <td>
                       <div>
                           <!-- FIXME -->
-                          <span class="mr-xxs text-primary clickable" ng-if="!!!task.extraData.isOwner"><i class="fa fa-share-square"
+                          <!-- <span class="mr-xxs text-primary clickable" ng-if="!!!task.extraData.isOwner"><i class="fa fa-share-square"
                               uib-tooltip="Shared from another organisation" tooltip-placement="right"></i></span>
                           <span class="mr-xxs text-primary clickable" ng-if="!!task.extraData.isOwner"><i class="fa fa-building-o"
-                              uib-tooltip="Created by my organisation" tooltip-placement="right"></i></span>
+                              uib-tooltip="Created by my organisation" tooltip-placement="right"></i></span> -->
                           <a href ui-sref="app.case.tasks-item({caseId: caseId, itemId:task._id})">{{task.title}}</a>
                       </div>
                       <div ng-show="task.status === 'Completed'" class="text-success">
@@ -109,11 +109,7 @@ <h4>
                     </td>
                     <td align="center">
                         <a href ng-if="task.extraData.shareCount > 0" ui-sref="app.case.tasks-item({caseId: caseId, itemId:task._id})" class="noline"
-                                uib-tooltip="{{ {
-                                    true: 'Current organisation has shared this Task with ' + task.extraData.shareCount + ' organisation(s)',
-                                    false: 'This Task has been shared by its owner with ' + task.extraData.shareCount + ' organisation(s)'
-                                }[task.extraData.isOwner] }}"
-                                tooltip-placement="left-middle">
+                            tooltip-placement="left-middle">
 
                             <i class="fa fa-users"></i>
                             ({{task.extraData.shareCount || 0}})
@@ -232,12 +228,7 @@ <h4>
                             </td>
                             <td align="center">
                                 <a href ng-if="task.extraData.shareCount > 0" ui-sref="app.case.tasks-item({caseId: caseId, itemId:task._id})" class="noline"
-                                        uib-tooltip="{{ {
-                                            true: 'Current organisation has shared this Task with ' + task.extraData.shareCount + ' organisation(s)',
-                                            false: 'This Task has been shared by its owner with ' + task.extraData.shareCount + ' organisation(s)'
-                                        }[task.extraData.isOwner] }}"
                                         tooltip-placement="left-middle">
-
                                     <i class="fa fa-users"></i>
                                     ({{task.extraData.shareCount || 0}})
                                 </a>

diff --git a/frontend/app/views/partials/observables/list/observables.html b/frontend/app/views/partials/observables/list/observables.html
@@ -85,10 +85,10 @@ <h4>
                 <td class="wrap">
                     <!-- FIXME -->
                     <div class="wrap clickable" ng-click="openArtifact(artifact)">
-                        <span class="mr-xxs text-primary clickable" ng-if="!!!artifact.extraData.isOwner"><i class="fa fa-share-square"
+                        <!-- <span class="mr-xxs text-primary clickable" ng-if="!!!artifact.extraData.isOwner"><i class="fa fa-share-square"
                             uib-tooltip="Shared from another organisation" tooltip-placement="right"></i></span>
                         <span class="mr-xxs text-primary clickable" ng-if="!!artifact.extraData.isOwner"><i class="fa fa-building-o"
-                            uib-tooltip="Created by my organisation" tooltip-placement="right"></i></span>
+                            uib-tooltip="Created by my organisation" tooltip-placement="right"></i></span> -->
                         <span class="wrap clickable" uib-tooltip="{{artifact.message}}" tooltip-placement="top-left">
                             {{(artifact.data | fang) || (artifact.attachment.name | fang)}}
                         </span>
@@ -108,10 +108,6 @@ <h4>
                 </td>
                 <td align="center">
                     <a href ng-if="artifact.extraData.shareCount > 0" ui-sref="app.case.observables-item({itemId: artifact._id})" class="noline"
-                            uib-tooltip="{{ {
-                                true: 'Current organisation has shared this Observable with ' + artifact.extraData.shareCount + ' organisation(s)',
-                                false: 'This Observable has been shared by its owner with ' + artifact.extraData.shareCount + ' organisation(s)'
-                            }[artifact.extraData.isOwner] }}"
                             tooltip-placement="left-middle">
 
                         <i class="fa fa-users"></i>