Mercurial > kallithea
changeset 8122:bf009cb3a470
summary: drop no_data in all possible ways
The controllers some odd "is" checks did and removed has been.
The javascript variables were never used.
summary.html didn't use no_data at all.
The only real use was in statistics.html ... where it seems like a better fit
to just use c.stats_percentage .
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 02 Jan 2020 23:00:36 +0100 |
parents | 7aff9d527bf1 |
children | 6fa658082c8e |
files | kallithea/controllers/summary.py kallithea/templates/summary/statistics.html kallithea/templates/summary/summary.html |
diffstat | 3 files changed, 3 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/summary.py Sat Dec 28 17:36:09 2019 +0100 +++ b/kallithea/controllers/summary.py Thu Jan 02 23:00:36 2020 +0100 @@ -138,7 +138,6 @@ c.stats_percentage = 0 if stats and stats.languages: - c.no_data = False is c.db_repo.enable_statistics lang_stats_d = ext_json.loads(stats.languages) lang_stats = [(x, {"count": y, @@ -148,7 +147,6 @@ c.trending_languages = lang_stats[:10] else: - c.no_data = True c.trending_languages = [] c.enable_downloads = c.db_repo.enable_downloads @@ -190,7 +188,6 @@ .scalar() c.stats_percentage = 0 if stats and stats.languages: - c.no_data = False is c.db_repo.enable_statistics lang_stats_d = ext_json.loads(stats.languages) c.commit_data = ext_json.loads(stats.commit_activity) c.overview_data = ext_json.loads(stats.commit_activity_combined) @@ -213,8 +210,7 @@ else: c.commit_data = {} c.overview_data = ([[ts_min_y, 0], [ts_max_y, 10]]) - c.trending_languages = {} - c.no_data = True + c.trending_languages = [] recurse_limit = 500 # don't recurse more than 500 times when parsing get_commits_stats(c.db_repo.repo_name, ts_min_y, ts_max_y, recurse_limit)
--- a/kallithea/templates/summary/statistics.html Sat Dec 28 17:36:09 2019 +0100 +++ b/kallithea/templates/summary/statistics.html Thu Jan 02 23:00:36 2020 +0100 @@ -28,8 +28,8 @@ </div> <div class="graph panel-body"> - <div> - %if c.no_data: + <div> + %if not c.stats_percentage: ${c.no_data_msg} %if h.HasPermissionAny('hg.admin')('enable stats on from summary'): ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name),class_="btn btn-default btn-xs")} @@ -54,7 +54,6 @@ <script type="text/javascript"> var data = ${h.js(c.trending_languages)}; var total = 0; -var no_data = true; var tbl = document.createElement('table'); tbl.setAttribute('class','trending_language_tbl'); var cnt = 0; @@ -63,7 +62,6 @@ } for (var i=0;i<data.length;i++){ cnt += 1; - no_data = false; var hide = cnt>2; var tr = document.createElement('tr');
--- a/kallithea/templates/summary/summary.html Sat Dec 28 17:36:09 2019 +0100 +++ b/kallithea/templates/summary/summary.html Thu Jan 02 23:00:36 2020 +0100 @@ -338,7 +338,6 @@ $(document).ready(function(){ var data = ${h.js(c.trending_languages)}; var total = 0; - var no_data = true; var tbl = document.createElement('table'); tbl.setAttribute('class','table'); var cnt = 0; @@ -347,7 +346,6 @@ } for (var i=0;i<data.length;i++){ cnt += 1; - no_data = false; var hide = cnt>2; var tr = document.createElement('tr');