Milimetric has submitted this change and it was merged.
Change subject: csv is stuck until deployment to labs
......................................................................
csv is stuck until deployment to labs
Change-Id: Ia7fa9899261b9b2597ac8cb9c61bd4d2ebb3d9b7
---
M wikimetrics/controllers/cohorts.py
M wikimetrics/static/js/cohortReview.js
M wikimetrics/templates/csv_upload_review.html
3 files changed, 16 insertions(+), 15 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/wikimetrics/controllers/cohorts.py
b/wikimetrics/controllers/cohorts.py
index d9a417c..a75492f 100644
--- a/wikimetrics/controllers/cohorts.py
+++ b/wikimetrics/controllers/cohorts.py
@@ -1,4 +1,5 @@
import json
+import csv
from flask import url_for, flash, render_template, redirect, request, jsonify
from flask.ext.login import current_user
from sqlalchemy.sql import exists
@@ -105,10 +106,10 @@
elif request.method == 'POST':
try:
- csv = request.files['csv']
+ csv_file = request.files['csv']
name = request.form['name']
project = request.form['project']
- if not csv or not name or len(name) is 0:
+ if not csv_file or not name or len(name) is 0:
flash('The form was invalid, please select a file and name the
cohort.')
return redirect(url_for('cohort_upload'))
@@ -116,7 +117,7 @@
flash('That Cohort name is already taken.')
return redirect(url_for('cohort_upload'))
- unparsed = csv.reader(normalize_newlines(csv.stream))
+ unparsed = csv.reader(normalize_newlines(csv_file.stream))
unvalidated = parse_records(unparsed, project)
(valid, invalid) = validate_records(unvalidated)
diff --git a/wikimetrics/static/js/cohortReview.js
b/wikimetrics/static/js/cohortReview.js
index 8885219..18227b2 100644
--- a/wikimetrics/static/js/cohortReview.js
+++ b/wikimetrics/static/js/cohortReview.js
@@ -1,16 +1,7 @@
-// TODO: get this nasty stuff out of here
-//var invalid = JSON.parse('{{ invalid_json | safe }}');
-//var valid = JSON.parse('{{ valid_json | safe }}');
-//var cohort_name = '{{ cohort_name }}';
-//var cohort_project = '{{ cohort_project }}';
-var invalid = [];
-var valid = [];
-var cohort_name = {};
-var cohort_project = {};
$(document).ready(function(){
ko.applyBindings({
- invalid: ko.observableArray(invalid),
- valid: ko.observableArray(valid)
+ invalid: ko.observableArray(from_the_server.invalid),
+ valid: ko.observableArray(from_the_server.valid)
});
$('form.finish-upload').submit(function(event){
@@ -22,7 +13,7 @@
url: form.attr('action'),
type: 'post',
data: {
- users: JSON.stringify(valid),
+ users: JSON.stringify(from_the_server.valid),
cohort_name: cohort_name,
cohort_project: cohort_project
}
diff --git a/wikimetrics/templates/csv_upload_review.html
b/wikimetrics/templates/csv_upload_review.html
index 59c21e7..d409689 100644
--- a/wikimetrics/templates/csv_upload_review.html
+++ b/wikimetrics/templates/csv_upload_review.html
@@ -56,5 +56,14 @@
<script
src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js"></script>
<script src="//ajax.aspnetcdn.com/ajax/knockout/knockout-2.2.1.js"></script>
<script src="{{ url_for('static', filename='js/cohortUpload.js') }}"></script>
+<script>
+ // TODO: get this nasty stuff out of here
+ var from_the_server = {
+ invalid : JSON.parse('{{ invalid_json | safe }}'),
+ valid : JSON.parse('{{ valid_json | safe }}'),
+ name : '{{ name }}',
+ project : '{{ project }}',
+ };
+</script>
<script src="{{ url_for('static', filename='js/cohortReview.js') }}"></script>
{% endblock %}
--
To view, visit https://gerrit.wikimedia.org/r/73025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7fa9899261b9b2597ac8cb9c61bd4d2ebb3d9b7
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric <[email protected]>
Gerrit-Reviewer: Milimetric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
