简柏林 / thingskit · Commits

Commit 5139299fd1eb64718528833f45b53f4f91aaebce

Authored by Volodymyr Babak
1 parent 06a0941d

Entity view fixes

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
@@ -136,7 +136,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti @@ -136,7 +136,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
136 List<Object> list = new ArrayList<>(); 136 List<Object> list = new ArrayList<>();
137 list.add(entityView.getTenantId()); 137 list.add(entityView.getTenantId());
138 list.add(entityView.getName()); 138 list.add(entityView.getName());
139 - cache.evict(list); 139 +// cache.evict(list);
140 entityViewDao.removeById(entityViewId.getId()); 140 entityViewDao.removeById(entityViewId.getId());
141 } 141 }
142 142
@@ -74,11 +74,11 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t @@ -74,11 +74,11 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t
74 function updateMinMaxDates() { 74 function updateMinMaxDates() {
75 if (scope.endTs) { 75 if (scope.endTs) {
76 scope.maxStartTs = angular.copy(new Date(scope.endTs.getTime() - 1000)); 76 scope.maxStartTs = angular.copy(new Date(scope.endTs.getTime() - 1000));
77 - scope.entityView.endTs = $filter('date')(scope.endTs, 'yyyy-MM-dd HH:mm:ss'); 77 + scope.entityView.endTs = scope.endTs.getTime();
78 } 78 }
79 if (scope.startTs) { 79 if (scope.startTs) {
80 scope.minEndTs = angular.copy(new Date(scope.startTs.getTime() + 1000)); 80 scope.minEndTs = angular.copy(new Date(scope.startTs.getTime() + 1000));
81 - scope.entityView.startTs = $filter('date')(scope.startTs, 'yyyy-MM-dd HH:mm:ss'); 81 + scope.entityView.startTs = scope.startTs.getTime();
82 } 82 }
83 } 83 }
84 84