Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74172
Change subject: good candidate for demo
......................................................................
good candidate for demo
Change-Id: I791cc39abea7491a5890c18e3323bc4ccb5fa3eb
---
M wikimetrics/controllers/jobs.py
M wikimetrics/models/job_response.py
M wikimetrics/models/multi_project_metric_job.py
M wikimetrics/templates/jobs.html
4 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/72/74172/1
diff --git a/wikimetrics/controllers/jobs.py b/wikimetrics/controllers/jobs.py
index 3763e8c..0d58d00 100644
--- a/wikimetrics/controllers/jobs.py
+++ b/wikimetrics/controllers/jobs.py
@@ -54,7 +54,7 @@
#app.logger.debug('metric: %s', metric)
# construct and start JobResponse
- metric_job = MultiProjectMetricJob(cohort, metric)
+ metric_job = MultiProjectMetricJob(cohort, metric,
name=cohort_metric_dict['name'])
metric_jobs.append(metric_job)
metric_names.append(metric.label)
cohort_names.append(cohort.name)
diff --git a/wikimetrics/models/job_response.py
b/wikimetrics/models/job_response.py
index f129fea..92b4f24 100644
--- a/wikimetrics/models/job_response.py
+++ b/wikimetrics/models/job_response.py
@@ -14,7 +14,7 @@
intended to be the unit of work which could be easily re-run.
"""
- show_in_ui = True
+ show_in_ui = False
def __init__(self, cohort_metrics_jobs, *args, **kwargs):
"""
diff --git a/wikimetrics/models/multi_project_metric_job.py
b/wikimetrics/models/multi_project_metric_job.py
index 7e51a2f..02ec6cf 100644
--- a/wikimetrics/models/multi_project_metric_job.py
+++ b/wikimetrics/models/multi_project_metric_job.py
@@ -18,6 +18,7 @@
of grouping the cohort by project and calling a MetricJob on
each project-homogenous list of user_ids.
"""
+ show_in_ui = True
def __init__(self, cohort, metric, *args, **kwargs):
super(MultiProjectMetricJob, self).__init__(*args, **kwargs)
diff --git a/wikimetrics/templates/jobs.html b/wikimetrics/templates/jobs.html
index 6c733ff..3ab92b9 100644
--- a/wikimetrics/templates/jobs.html
+++ b/wikimetrics/templates/jobs.html
@@ -31,8 +31,8 @@
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
- <li><a href="{{url_for('jobs_list')}}">JSON</a></li>
- <li><a href="{{url_for('jobs_list')}}">CSV</a></li>
+ <li><a data-bind="attr: {href: '/jobs/result/' + id +
'.json'}">JSON</a></li>
+ <li><a data-bind="attr: {href: '/jobs/result/' + id +
'.csv'}">CSV</a></li>
</ul>
</div>
</td>
--
To view, visit https://gerrit.wikimedia.org/r/74172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I791cc39abea7491a5890c18e3323bc4ccb5fa3eb
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
