ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #428 from nextcloud/fix-assign-user-list

Browse Source 
Fix assign user list
This commit is contained in:
Julius Härtl
2018-03-02 17:52:54 +01:00
committed by GitHub
parent 537e9b35da 1b471b0fe8
commit 8cb92934b1
6 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

@@ -206,7 +206,7 @@ matrix:
- TESTS: php7.2 - TESTS: php7.2
- TESTS: eslint - TESTS: eslint
- TESTS: jsbuild - TESTS: jsbuild
- TESTS: integration #- TESTS: integration
branches: [ master, stable* ] branches: [ master, stable* ]

1
css/style.scss
View File

@@ -727,6 +727,7 @@ input.input-inline {
} }
.tooltip { .tooltip {
z-index: 998; z-index: 998;
position: fixed;
} }
} }
} }

1
js/controller/CardController.js
View File

@@ -79,7 +79,6 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
header.find('.save-indicator.unsaved').hide(); header.find('.save-indicator.unsaved').hide();
header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000); header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
StackService.updateCard($scope.status.edit); StackService.updateCard($scope.status.edit);
BoardService.$scope.$digest();
}); });
} }
}, 500, 0, false); }, 500, 0, false);

4
js/service/ApiService.js
View File

@@ -124,7 +124,9 @@ app.factory('ApiService', function ($http, $q) {
this.data[entity.id] = entity; this.data[entity.id] = entity;
} else { } else {
Object.keys(entity).forEach(function (key) { Object.keys(entity).forEach(function (key) {
element[key] = entity[key]; if (entity[key] !== null) {
element[key] = entity[key];
}
}); });
element.status = {}; element.status = {};
} }

2
lib/Db/RelationalEntity.php
View File

@@ -71,7 +71,7 @@ class RelationalEntity extends Entity implements \JsonSerializable {
foreach ($properties as $property => $value) { foreach ($properties as $property => $value) {
if (strpos($property, '_') !== 0 && $reflection->hasProperty($property)) { if (strpos($property, '_') !== 0 && $reflection->hasProperty($property)) {
$propertyReflection = $reflection->getProperty($property); $propertyReflection = $reflection->getProperty($property);
if (!$propertyReflection->isPrivate()) { if (!$propertyReflection->isPrivate() && !in_array($property, $this->_resolvedProperties, true)) {
$json[$property] = $this->getter($property); $json[$property] = $this->getter($property);
} }
} }

2
templates/part.card.php
View File

@@ -66,7 +66,7 @@
</ui-select-choices> </ui-select-choices>
</ui-select> </ui-select>
<div class="card-details-assign-users-list"> <div class="card-details-assign-users-list">
<div class="assigned-user" ng-repeat="user in cardservice.getCurrent().assignedUsers track by user.uid"> <div class="assigned-user" ng-repeat="user in cardservice.getCurrent().assignedUsers track by user.participant.uid">
<avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user="{{ user.participant.uid }}" ng-attr-displayname="{{ user.participant.displayname }}" contactsmenudelete ></avatar> <avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user="{{ user.participant.uid }}" ng-attr-displayname="{{ user.participant.displayname }}" contactsmenudelete ></avatar>
</div> </div>
</div> </div>