diff --git a/frontend/app/scripts/directives/updatableUser.js b/frontend/app/scripts/directives/updatableUser.js index 1722831dd6..40a5e4c258 100644 --- a/frontend/app/scripts/directives/updatableUser.js +++ b/frontend/app/scripts/directives/updatableUser.js @@ -1,25 +1,25 @@ -(function() { +(function () { 'use strict'; angular.module('theHiveDirectives') - .directive('updatableUser', function(UserSrv, QuerySrv, UtilsSrv, AuthenticationSrv, NotificationSrv) { + .directive('updatableUser', function (UserSrv, QuerySrv, UtilsSrv, AuthenticationSrv, NotificationSrv) { return { restrict: 'E', - link: function(scope, element, attrs, ctrl, transclude) { + link: function (scope, element, attrs, ctrl, transclude) { var cached = false; UtilsSrv.updatableLink(scope, element, attrs, ctrl, transclude); - scope.setValue = function(value) { + scope.setValue = function (value) { scope.value = value; }; scope.getUserInfo = UserSrv.getCache; - scope.$watch('updatable.updating', function(value) { + scope.$watch('updatable.updating', function (value) { - if(value === true && !cached) { + if (value === true && !cached) { var assignableUsers = []; - if(_.isFunction(scope.query)) { + if (_.isFunction(scope.query)) { assignableUsers = scope.query.apply(this, scope.queryParams); } else { assignableUsers = scope.query; @@ -32,12 +32,12 @@ }, sort: ['+name'] }) - .then(function(users) { - scope.userList = users; - }) - .catch(function(err) { - NotificationSrv.error('Fetching users', err.data, err.status); - }); + .then(function (users) { + scope.userList = users; + }) + .catch(function (err) { + NotificationSrv.error('Fetching users', err.data, err.status); + }); cached = true; } @@ -47,6 +47,7 @@ scope: { value: '=?', query: '=', + blankText: '@', queryParams: '=', onUpdate: '&', active: '=?', diff --git a/frontend/app/views/directives/updatable-user.html b/frontend/app/views/directives/updatable-user.html index a64a013626..fd9d33a7c6 100644 --- a/frontend/app/views/directives/updatable-user.html +++ b/frontend/app/views/directives/updatable-user.html @@ -1,6 +1,7 @@
- + {{blankText || 'Not Specified'}} + diff --git a/frontend/app/views/partials/case/case.tasks.html b/frontend/app/views/partials/case/case.tasks.html index 5eb8fd57e3..220c573b4d 100755 --- a/frontend/app/views/partials/case/case.tasks.html +++ b/frontend/app/views/partials/case/case.tasks.html @@ -1,6 +1,7 @@
-
+
@@ -11,8 +12,7 @@

-
@@ -28,24 +28,25 @@

-
- -
+
+ +
-
- - - - - -
+
+ + + + + +
@@ -61,7 +62,8 @@

- + Group @@ -69,50 +71,57 @@

Date Assignee - Actions + Actions - + - + {{task.group}}
- - + - + - - - - - {{task.title}} - -
-
- Closed after {{(task.endDate - task.startDate) | amDurationFormat : 'milliseconds'}} -
-
- Started -
+ + + + + {{task.title}} + + +
+ Closed after {{(task.endDate - task.startDate) | amDurationFormat : + 'milliseconds'}} +
+
+ Started +
@@ -128,10 +137,12 @@

{{task.startDate | shortDate}} - + - + @@ -148,16 +159,21 @@

- + - + - + - + @@ -189,7 +205,8 @@

- + Group @@ -197,55 +214,65 @@

Date Assignee - Actions + Actions - + - + + - + {{task.group}} -
- - + - - - - - - - - {{task.title}} - -
-
- Closed after {{(task.endDate - task.startDate) | amDurationFormat : 'milliseconds'}} -
-
- Started -
+ + + + + + + + {{task.title}} + +

+
+ Closed after {{(task.endDate - task.startDate) | amDurationFormat : + 'milliseconds'}} +
+
+ Started +
- + ({{task.extraData.shareCount || 0}}) @@ -255,10 +282,14 @@

{{task.startDate | shortDate}} - + - + @@ -270,21 +301,27 @@

- + - + - + - + - + diff --git a/frontend/app/views/partials/case/case.tasks.item.html b/frontend/app/views/partials/case/case.tasks.item.html index 6190531c0e..ef8d9ad1ad 100644 --- a/frontend/app/views/partials/case/case.tasks.item.html +++ b/frontend/app/views/partials/case/case.tasks.item.html @@ -6,7 +6,8 @@

This task requires an action from your organisation. - +
@@ -55,7 +56,8 @@

- + | @@ -88,7 +90,7 @@

Title
- +
{{task.title}} @@ -98,7 +100,7 @@

Group
- +
{{task.group}} @@ -108,7 +110,8 @@

Assignee
- +
@@ -120,7 +123,7 @@

Start date
- +
@@ -162,14 +165,15 @@

-

Description

-
- -
-
-
- Not specified -
+

Description

+
+ +
+
+
+ Not specified +
@@ -206,17 +210,24 @@

Task logs

- -
+ +
- - + - -
-
-
- -
+

Task sharing

+ +
+ +