From 6b7c6f09506b69c32f7bb42d91923bbdfcdab1db Mon Sep 17 00:00:00 2001 From: eldadfux Date: Wed, 14 Aug 2019 00:15:04 +0300 Subject: [PATCH] Fixed empy list total pages sum --- app/views/console/users/index.phtml | 2 +- public/dist/scripts/app-all.js | 3 +-- public/dist/scripts/app.js | 3 +-- public/scripts/filters.js | 15 ++------------- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml index 7c8d5921ee..c3d3aa172b 100644 --- a/app/views/console/users/index.phtml +++ b/app/views/console/users/index.phtml @@ -20,7 +20,7 @@ $limit = 3; data-event="submit" data-param-search="{{router.params.search}}" data-param-limit="" - data-param-offset="0" + data-param-offset="" data-param-order-type="ASC" data-scope="sdk" data-name="project-users" diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js index e872ae8978..a56e9861fb 100644 --- a/public/dist/scripts/app-all.js +++ b/public/dist/scripts/app-all.js @@ -2345,8 +2345,7 @@ return n[0];}).join('')||'--';let background=themes[theme[theme.length-1]]['back (hours?hours+"h ":"")+ (minutes?minutes+"m ":"")+ Number.parseFloat(seconds).toFixed(0)+"s";} -return"< 1s";}).add('markdown',function($value,markdown){return markdown.render($value);}).add('pageCurrent',function($value){return Math.ceil(parseInt($value||0)/3)+1;}).add('pageTotal',function($value){return Math.ceil(parseInt($value||0)/3);}).add('pageNextDisbaled',function($value,element,expression,container){let sum=parseInt(element.dataset['sum']||0);$value=parseInt($value||0)+5;console.log('next','value',$value,'sum',sum,($value>sum));if($value>sum&&sum>0){return'disabled';} -return''}).add('humanFileSize',function($value){if(!$value){return 0;} +return"< 1s";}).add('markdown',function($value,markdown){return markdown.render($value);}).add('pageCurrent',function($value){return Math.ceil(parseInt($value||0)/3)+1;}).add('pageTotal',function($value){let total=Math.ceil(parseInt($value||0)/3);return(total)?total:1;}).add('humanFileSize',function($value){if(!$value){return 0;} let thresh=1000;if(Math.abs($value)=thresh&&u'+units[u]+'';}).add('statsTotal',function($value){if(!$value){return 0;} $value=abbreviate($value,1,false,false);return($value==='0')?'N/A':$value;});function abbreviate(number,maxPlaces,forcePlaces,forceLetter){number=Number(number);forceLetter=forceLetter||false;if(forceLetter!==false){return annotate(number,maxPlaces,forcePlaces,forceLetter);} diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js index 02afcf7145..c6a5d63a7d 100644 --- a/public/dist/scripts/app.js +++ b/public/dist/scripts/app.js @@ -252,8 +252,7 @@ return n[0];}).join('')||'--';let background=themes[theme[theme.length-1]]['back (hours?hours+"h ":"")+ (minutes?minutes+"m ":"")+ Number.parseFloat(seconds).toFixed(0)+"s";} -return"< 1s";}).add('markdown',function($value,markdown){return markdown.render($value);}).add('pageCurrent',function($value){return Math.ceil(parseInt($value||0)/3)+1;}).add('pageTotal',function($value){return Math.ceil(parseInt($value||0)/3);}).add('pageNextDisbaled',function($value,element,expression,container){let sum=parseInt(element.dataset['sum']||0);$value=parseInt($value||0)+5;console.log('next','value',$value,'sum',sum,($value>sum));if($value>sum&&sum>0){return'disabled';} -return''}).add('humanFileSize',function($value){if(!$value){return 0;} +return"< 1s";}).add('markdown',function($value,markdown){return markdown.render($value);}).add('pageCurrent',function($value){return Math.ceil(parseInt($value||0)/3)+1;}).add('pageTotal',function($value){let total=Math.ceil(parseInt($value||0)/3);return(total)?total:1;}).add('humanFileSize',function($value){if(!$value){return 0;} let thresh=1000;if(Math.abs($value)=thresh&&u'+units[u]+'';}).add('statsTotal',function($value){if(!$value){return 0;} $value=abbreviate($value,1,false,false);return($value==='0')?'N/A':$value;});function abbreviate(number,maxPlaces,forcePlaces,forceLetter){number=Number(number);forceLetter=forceLetter||false;if(forceLetter!==false){return annotate(number,maxPlaces,forcePlaces,forceLetter);} diff --git a/public/scripts/filters.js b/public/scripts/filters.js index 52ecaddaee..88434c17bb 100644 --- a/public/scripts/filters.js +++ b/public/scripts/filters.js @@ -73,19 +73,8 @@ window.ls.filter return Math.ceil(parseInt($value || 0) / 3) + 1; }) .add('pageTotal', function ($value) { - return Math.ceil(parseInt($value || 0) / 3); - }) - .add('pageNextDisbaled', function ($value, element, expression, container) { - let sum = parseInt(element.dataset['sum'] || 0); - $value = parseInt($value || 0) + 5; - - console.log('next', 'value', $value, 'sum', sum, ($value > sum)); - - if($value > sum && sum > 0) { - return 'disabled'; - } - - return '' + let total = Math.ceil(parseInt($value || 0) / 3); + return (total) ? total : 1; }) .add('humanFileSize', function ($value) { if (!$value) {