kallithea Changeset - 6f6ee1cfe2d6

Changeset - 6f6ee1cfe2d6

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2017-05-03 03:41:11
mads@kiilerich.com

statistics: fix invalid js after 33b71a130b16

2 files changed with 4 insertions and 3 deletions:

kallithea/controllers/summary.py

kallithea/templates/summary/statistics.html

0 comments (0 inline, 0 general)

kallithea/controllers/summary.py

➞

Show inline comments

@@ @@ -183,26 +183,26 @@ class SummaryController(BaseRepoControll @@
         ts_min_y = mktime(td_1y.timetuple())
         ts_max_y = mktime(td.timetuple())
         c.ts_min = ts_min_m
         c.ts_max = ts_max_y
         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 = json.loads(stats.languages)
             c.commit_data = stats.commit_activity
             c.overview_data = stats.commit_activity_combined
             c.commit_data = json.loads(stats.commit_activity)
             c.overview_data = json.loads(stats.commit_activity_combined)
             lang_stats = ((x, {"count": y,
                                "desc": LANGUAGES_EXTENSIONS_MAP.get(x)})
                           for x, y in lang_stats_d.items())
             c.trending_languages = (
                 sorted(lang_stats, reverse=True, key=lambda k: k[1])[:10]
+            )
             last_rev = stats.stat_on_revision + 1
             c.repo_last_rev = c.db_repo_scm_instance.count() \
                 if c.db_repo_scm_instance.revisions else 0
             if last_rev == 0 or c.repo_last_rev == 0:

kallithea/templates/summary/statistics.html

➞

Show inline comments

@@ @@ -435,16 +435,17 @@ function SummaryPlot(from,to,dataset,ove @@
     overview.setSelection(initial_ranges);
     plot.subscribe("plotselected", plotselected);
     plot.subscribe("plothover", plothover);
     overview.subscribe("plotselected", function (ranges) {
         plot.setSelection(ranges);
     });
     // user choices on overview
     YUE.on(choiceContainer.getElementsByTagName("input"), "click", plotchoiced, [data, initial_ranges]);
+}
     SummaryPlot(${h.jshtml(c.ts_min)}, ${h.jshtml(c.ts_max)}, ${h.js(c.commit_data)}, ${h.js(c.overview_data)});
 SummaryPlot(${h.js(c.ts_min)}, ${h.js(c.ts_max)}, ${h.js(c.commit_data)}, ${h.js(c.overview_data)});
 </script>
 </%def>

0 comments (0 inline, 0 general)