Fixed logs table, added spinner to logs refresh

This commit is contained in:
Mark McDowall 2013-11-11 14:31:33 -08:00
parent 4eecf3d1ab
commit 0747e53d4f
3 changed files with 15 additions and 7 deletions

View File

@ -11,6 +11,10 @@ define(
template : 'Shared/Toolbar/ButtonTemplate',
className: 'btn',
ui: {
icon: 'i'
},
events: {
'click': 'onClick'
},
@ -73,7 +77,7 @@ define(
var callback = this.model.get('callback');
if (callback) {
callback.call(this.model.ownerContext);
callback.call(this.model.ownerContext, this);
}
}
});

View File

@ -12,7 +12,8 @@ define(
'System/Logs/Files/ContentsView',
'System/Logs/Files/ContentsModel',
'Shared/Toolbar/ToolbarLayout',
'Shared/LoadingView'
'Shared/LoadingView',
'jQuery/jquery.spin'
], function (vent,
Marionette,
Backgrid,
@ -141,7 +142,8 @@ define(
_refreshLogs: function () {
this.contents.close();
this.collection.fetch();
var promise = this.collection.fetch();
buttonContext.ui.icon.spinForPromise(promise);
},
_commandComplete: function (options) {

View File

@ -10,7 +10,8 @@ define(
'Shared/Grid/Pager',
'System/Logs/LogsCollection',
'Shared/Toolbar/ToolbarLayout',
'Shared/LoadingView'
'Shared/LoadingView',
'jQuery/jquery.spin'
], function (vent, Marionette, Backgrid, LogTimeCell, LogLevelCell, LogRow, GridPager, LogCollection, ToolbarLayout, LoadingView) {
return Marionette.Layout.extend({
template: 'System/Logs/Table/LogsTableLayoutTemplate',
@ -65,6 +66,7 @@ define(
onRender: function () {
this.grid.show(new LoadingView());
this.collection.fetch();
},
onShow: function () {
@ -115,10 +117,10 @@ define(
}));
},
_refreshLogs: function () {
_refreshLogs: function (buttonContext) {
this.collection.state.currentPage = 1;
this.collection.fetch({ reset: true });
this._showTable();
var promise = this.collection.fetch({ reset: true });
buttonContext.ui.icon.spinForPromise(promise);
},
_commandComplete: function (options) {