kallithea Changeset - bf009cb3a470

Changeset - bf009cb3a470

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 6 years ago 2020-01-02 23:00:36
mads@kiilerich.com

Grafted from: 2ca07bfcddd8

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 .

3 files changed with 3 insertions and 11 deletions:

kallithea/controllers/summary.py

kallithea/templates/summary/statistics.html

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/controllers/summary.py

➞

Show inline comments

@@ @@ -135,23 +135,21 @@ class SummaryController(BaseRepoControll @@
             .filter(Statistics.repository == c.db_repo) \
             .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)
             lang_stats = [(x, {"count": y,
                                "desc": LANGUAGES_EXTENSIONS_MAP.get(x, '?')})
                           for x, y in lang_stats_d.items()]
             lang_stats.sort(key=lambda k: (-k[1]['count'], k[0]))
             c.trending_languages = lang_stats[:10]
         else:
             c.no_data = True
             c.trending_languages = []
         c.enable_downloads = c.db_repo.enable_downloads
         c.readme_data, c.readme_file = \
             self.__get_readme_data(c.db_repo)
         return render('summary/summary.html')
@@ @@ -187,13 +185,12 @@ class SummaryController(BaseRepoControll @@
         stats = Statistics.query() \
             .filter(Statistics.repository == c.db_repo) \
             .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)
             lang_stats = ((x, {"count": y,
                                "desc": LANGUAGES_EXTENSIONS_MAP.get(x)})
@@ @@ -210,12 +207,11 @@ class SummaryController(BaseRepoControll @@
             else:
                 c.stats_percentage = '%.2f' % ((float((last_rev)) /
                                                 c.repo_last_rev) * 100)
         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)
         return render('summary/statistics.html')

kallithea/templates/summary/statistics.html

➞

Show inline comments

@@ @@ -25,14 +25,14 @@ ${self.repo_context_bar('summary')} @@
     <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </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")}
            %endif
         %else:
             ${_('Stats gathered: ')} ${c.stats_percentage}%
@@ @@ -51,22 +51,20 @@ ${self.repo_context_bar('summary')} @@
     </div>
 </div>
 <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;
 for (var i=0;i<data.length;i++){
     total+= data[i][1].count;
+}
 for (var i=0;i<data.length;i++){
     cnt += 1;
     no_data = false;
     var hide = cnt>2;
     var tr = document.createElement('tr');
     if (hide){
         tr.setAttribute('style','display:none');
         tr.setAttribute('class','stats_hidden');

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -335,22 +335,20 @@ $(document).ready(function(){ @@
 %if c.show_stats:
 <script type="text/javascript">
 $(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;
     for (var i=0;i<data.length;i++){
         total+= data[i][1].count;
+    }
     for (var i=0;i<data.length;i++){
         cnt += 1;
         no_data = false;
         var hide = cnt>2;
         var tr = document.createElement('tr');
         if (hide){
             tr.setAttribute('style','display:none');
             tr.setAttribute('class','stats_hidden');

0 comments (0 inline, 0 general)