232402_test_to_dev #1637

Merged
carlossa merged 27 commits from 232402_test_to_dev into dev 2023-06-26 10:10:54 +00:00
3 changed files with 2 additions and 3 deletions
Showing only changes of commit 57277ceb2e - Show all commits

View File

@ -38,7 +38,7 @@
</div>
<div class="user-changes">
<div class="model-log" ng-repeat="modelLog in ::userLog.logs">
<div class="model-info vn-mb-sm" ng-if="::!$ctrl.byRecord">
<div class="model-info vn-my-sm" ng-if="::!$ctrl.byRecord">
<vn-icon
icon="filter_alt"
translate-attr="{title: 'Show all record changes'}"

View File

@ -120,7 +120,7 @@ export default class Controller extends Section {
const userChanged = !prevLog
|| log.userFk != prevLog.userFk
|| time < prevTime - day * 2
|| nLogs >= 10;
|| nLogs >= 6;
if (userChanged) {
originLog.logs.push(userLog = {

View File

@ -74,7 +74,6 @@ vn-log {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-top: 5px;
min-height: 22px;
& > .model-name {