x/bansho
Code Issues Proposed changes

Add pagingSize inside layout config

Browse Source 
Change-Id: I8990b0fcd94df7c17110f7df4fc973809022c3f0
This commit is contained in:
flavien peyre 2015-08-12 13:26:33 -04:00
parent bc982cabde
commit 90957f83e9
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/components/config/config.js
View File

@ -176,10 +176,19 @@ angular.module('bansho.config', [])
this.getTheme = function () {
var theme;
if (layoutConfig.data) {
theme = layoutConfig.data.banshoConfig.theme;
}
return theme;
if (layoutConfig.data) {
theme = layoutConfig.data.banshoConfig.theme;
}
return theme;
};
this.getPagingSize = function () {
var pagingSize;
if (layoutConfig.data) {
pagingSize = layoutConfig.data.banshoConfig.pagingSize;
}
return pagingSize;
};
var saveLayoutConfig = function () {

3
app/components/config/defaultLayoutConfig.json
View File

@ -1,6 +1,7 @@
{
"banshoConfig": {
"theme": "dark"
"theme": "dark",
"pagingSize": 50
},
"topbar": {
"template": "page",

6
app/components/datasource/datasource.js
View File

@ -3,8 +3,8 @@
angular.module('bansho.datasource', ['bansho.surveil'])
.value('tableGlobalConfig', {'cellToFieldsMap': {}, 'cellWrappableField': {}})
.service('datasource', ['$filter', 'surveilStatus', 'surveilConfig', 'surveilQuery', 'componentsConfig', 'tableGlobalConfig',
function ($filter, surveilStatus, surveilConfig, surveilQuery, componentsConfig, tableGlobalConfig) {
.service('datasource', ['$filter', 'surveilStatus', 'surveilConfig', 'surveilQuery', 'componentsConfig', 'tableGlobalConfig', 'configManager',
function ($filter, surveilStatus, surveilConfig, surveilQuery, componentsConfig, tableGlobalConfig, configManager) {
var providerServices = {
status: surveilStatus,
config: surveilConfig
@ -60,7 +60,7 @@ angular.module('bansho.datasource', ['bansho.surveil'])
if (config[tableId].pagingbar) {
config[tableId].queryPaging = {
page: 0,
size: 50
size: configManager.getPagingSize()
};
}
},