refs #5900 Show user every 6 changes, model info margin fix
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
parent
df049201f1
commit
57277ceb2e
|
@ -38,7 +38,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="user-changes">
|
<div class="user-changes">
|
||||||
<div class="model-log" ng-repeat="modelLog in ::userLog.logs">
|
<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
|
<vn-icon
|
||||||
icon="filter_alt"
|
icon="filter_alt"
|
||||||
translate-attr="{title: 'Show all record changes'}"
|
translate-attr="{title: 'Show all record changes'}"
|
||||||
|
|
|
@ -120,7 +120,7 @@ export default class Controller extends Section {
|
||||||
const userChanged = !prevLog
|
const userChanged = !prevLog
|
||||||
|| log.userFk != prevLog.userFk
|
|| log.userFk != prevLog.userFk
|
||||||
|| time < prevTime - day * 2
|
|| time < prevTime - day * 2
|
||||||
|| nLogs >= 10;
|
|| nLogs >= 6;
|
||||||
|
|
||||||
if (userChanged) {
|
if (userChanged) {
|
||||||
originLog.logs.push(userLog = {
|
originLog.logs.push(userLog = {
|
||||||
|
|
|
@ -74,7 +74,6 @@ vn-log {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
margin-top: 5px;
|
|
||||||
min-height: 22px;
|
min-height: 22px;
|
||||||
|
|
||||||
& > .model-name {
|
& > .model-name {
|
||||||
|
|
Loading…
Reference in New Issue