github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(log-viewer): Add the ability to specify displayed line count (#1914)

pull/1916/head
kirdia 2018-05-21 11:51:56 +03:00 committed by Anthony Lapenna
parent 63d338c4da
commit 19c3fa276b
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/docker/components/log-viewer/log-viewer.js
View File

@ -4,6 +4,7 @@ angular.module('portainer.docker').component('logViewer', {
bindings: { bindings: {
data: '=', data: '=',
displayTimestamps: '=', displayTimestamps: '=',
logCollectionChange: '<' logCollectionChange: '<',
lineCount: '='
} }
}); });

8
app/docker/components/log-viewer/logViewer.html
View File

@ -33,6 +33,14 @@
<input class="form-control" type="text" name="logs_search" ng-model="$ctrl.state.search" ng-change="$ctrl.state.selectedLines.length = 0;" placeholder="Filter..."> <input class="form-control" type="text" name="logs_search" ng-model="$ctrl.state.search" ng-change="$ctrl.state.selectedLines.length = 0;" placeholder="Filter...">
</div> </div>
</div> </div>
<div class="form-group">
<label for="lines_count" class="col-sm-1 control-label text-left">
Lines
</label>
<div class="col-sm-11">
<input class="form-control" type="number" name="lines_count" ng-model="$ctrl.lineCount" placeholder="Enter no of lines...">
</div>
</div>
<div class="form-group" ng-if="$ctrl.state.copySupported"> <div class="form-group" ng-if="$ctrl.state.copySupported">
<label class="col-sm-1 control-label text-left"> <label class="col-sm-1 control-label text-left">
Actions Actions

2
app/docker/views/containers/logs/containerlogs.html
View File

@ -6,5 +6,5 @@
</rd-header> </rd-header>
<log-viewer <log-viewer
data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" line-count="state.lineCount"
></log-viewer> ></log-viewer>

2
app/docker/views/services/logs/servicelogs.html
View File

@ -6,5 +6,5 @@
</rd-header> </rd-header>
<log-viewer <log-viewer
data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" line-count="state.lineCount"
></log-viewer> ></log-viewer>

2
app/docker/views/tasks/logs/tasklogs.html
View File

@ -6,5 +6,5 @@
</rd-header> </rd-header>
<log-viewer <log-viewer
data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps" line-count="state.lineCount"
></log-viewer> ></log-viewer>