From f32721d1e60446e1b171eb2b6a383a508668b372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 28 Feb 2018 12:10:05 +0100 Subject: [PATCH 1/5] Fix popover position of assigned users MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes #385 Signed-off-by: Julius Härtl --- css/style.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/css/style.scss b/css/style.scss index 092f61edb..1f6f77fbd 100644 --- a/css/style.scss +++ b/css/style.scss @@ -727,6 +727,7 @@ input.input-inline { } .tooltip { z-index: 998; + position: fixed; } } } From 0e092d3495b20f7d923be06ad8d8d33f6153d6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 28 Feb 2018 12:21:14 +0100 Subject: [PATCH 2/5] Only return updated properties not resolvable ones MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes #406 Signed-off-by: Julius Härtl --- js/controller/CardController.js | 1 - lib/Db/RelationalEntity.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/js/controller/CardController.js b/js/controller/CardController.js index 786b3260a..0a7e9a5d7 100644 --- a/js/controller/CardController.js +++ b/js/controller/CardController.js @@ -79,7 +79,6 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo header.find('.save-indicator.unsaved').hide(); header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000); StackService.updateCard($scope.status.edit); - BoardService.$scope.$digest(); }); } }, 500, 0, false); diff --git a/lib/Db/RelationalEntity.php b/lib/Db/RelationalEntity.php index 1dc619758..188a36897 100644 --- a/lib/Db/RelationalEntity.php +++ b/lib/Db/RelationalEntity.php @@ -71,7 +71,7 @@ class RelationalEntity extends Entity implements \JsonSerializable { foreach ($properties as $property => $value) { if (strpos($property, '_') !== 0 && $reflection->hasProperty($property)) { $propertyReflection = $reflection->getProperty($property); - if (!$propertyReflection->isPrivate()) { + if (!$propertyReflection->isPrivate() && !in_array($property, $this->_resolvedProperties, true)) { $json[$property] = $this->getter($property); } } From 8f5ded6a287fdb1b4ba9763dba99cfaf0dbbe48b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 28 Feb 2018 16:49:00 +0100 Subject: [PATCH 3/5] Track by correct property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- templates/part.card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/part.card.php b/templates/part.card.php index c6f619739..2880c782e 100644 --- a/templates/part.card.php +++ b/templates/part.card.php @@ -66,7 +66,7 @@
-
+
From 76e3cc5061e347aac4e727c81658a53a04ae9292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 28 Feb 2018 16:54:30 +0100 Subject: [PATCH 4/5] Do not overwrite emtpy values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- js/service/ApiService.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/service/ApiService.js b/js/service/ApiService.js index dbb1b56e9..1ffaad41a 100644 --- a/js/service/ApiService.js +++ b/js/service/ApiService.js @@ -124,7 +124,9 @@ app.factory('ApiService', function ($http, $q) { this.data[entity.id] = entity; } else { Object.keys(entity).forEach(function (key) { - element[key] = entity[key]; + if (entity[key] !== null) { + element[key] = entity[key]; + } }); element.status = {}; } From 1b471b0fe86198718a45b9329f43a6fcb93c41e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 2 Mar 2018 16:14:39 +0100 Subject: [PATCH 5/5] Disable integration tests for now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0b3fd8356..7b2d85c51 100644 --- a/.drone.yml +++ b/.drone.yml @@ -206,7 +206,7 @@ matrix: - TESTS: php7.2 - TESTS: eslint - TESTS: jsbuild - - TESTS: integration + #- TESTS: integration branches: [ master, stable* ]