x
/
bansho
Code Issues Proposed changes

table.js: Cleanup additionalfields 

Change-Id: I475ce4ce363b1aa6d8a94a57da45e4b256ce1b69
This commit is contained in:
aviau 2015-05-20 13:59:13 -04:00
parent 1260920476
commit 5726557baf
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/components/table/table.js
View File

@ -52,8 +52,8 @@ angular.module('bansho.table', ['bansho.live',
});
});
getData = function (requestFields, filters, apiName, additionnalFields) {
var promise = backendClient.getTableData(requestFields, filters, apiName, additionnalFields);
getData = function (requestFields, filters, apiName) {
var promise = backendClient.getTableData(requestFields, filters, apiName);
promise.then(function (data) {
$scope.entries = data;
conf.entries = data;
@ -62,12 +62,12 @@ angular.module('bansho.table', ['bansho.live',
});
};
getData(requestFields, conf.filters, conf.apiName, conf.additionnalQueryFields);
getData(requestFields, conf.filters, conf.apiName);
if (tableGlobalConfig.refreshInterval !== 0) {
promisesManager.addAjaxPromise(
$interval(function () {
getData(requestFields, conf.filters, conf.apiName, conf.additionnalQueryFields);
getData(requestFields, conf.filters, conf.apiName);
}, tableGlobalConfig.refreshInterval)
);
}
@ -96,7 +96,6 @@ angular.module('bansho.table', ['bansho.live',
tablesConfig[attrs.tableId] = {};
conf = tablesConfig[attrs.tableId];
conf.filters = {};
conf.additionnalQueryFields = {};
conf.cells = { 'text': [], 'name': [] };
conf.cells.text = attrs.cellsText.split(',');
@ -112,10 +111,6 @@ angular.module('bansho.table', ['bansho.live',
conf.filters = JSON.parse(attrs.filters);
}
if (!!attrs.additionnalQueryFields) {
conf.additionnalQueryFields = JSON.parse(attrs.additionnalQueryFields);
}
if (!!attrs.refreshInterval) {
tableGlobalConfig.refreshInterval = parseInt(attrs.refreshInterval * 1000, 10);
}
@ -169,7 +164,6 @@ angular.module('bansho.table', ['bansho.live',
this.Filters = config.filters;
this.IsWrappable = config.isWrappable;
this.NoRepeatCell = config.noRepeatCell;
this.additionnalQueryFields = config.additionnalQueryFields;
})
.filter('wrappableStyle', ['tablesConfig', 'tableGlobalConfig', function (tablesConfig, tableGlobalConfig) {