Milimetric has submitted this change and it was merged.
Change subject: redirect fix
......................................................................
redirect fix
Change-Id: If7ce83c4bacb6da6354082ee47a09de6751f4bfa
---
M wikimetrics/controllers/cohorts.py
M wikimetrics/controllers/demo.py
2 files changed, 33 insertions(+), 22 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/wikimetrics/controllers/cohorts.py
b/wikimetrics/controllers/cohorts.py
index 9f01f1f..fae3c7b 100644
--- a/wikimetrics/controllers/cohorts.py
+++ b/wikimetrics/controllers/cohorts.py
@@ -189,7 +189,7 @@
project = users[0]['project']
logging.debug('adding cohort: {0}, with project: {1}'.format(name,
project))
cohort = create_cohort(name, description, project, valid)
- return json_redirect(url_for('cohorts_list'))
+ return json_redirect(url_for('cohorts_index'))
except Exception, e:
logging.exception(str(e))
diff --git a/wikimetrics/controllers/demo.py b/wikimetrics/controllers/demo.py
index 50b8704..d0a324e 100644
--- a/wikimetrics/controllers/demo.py
+++ b/wikimetrics/controllers/demo.py
@@ -17,27 +17,7 @@
if app.config['DEBUG']:
- @app.route('/demo/metric/random/<int:cohort_id>')
- def run_task_in_celery(cohort_id):
- db_session = db.get_session()
- user_ids = db_session.query(WikiUser.mediawiki_userid)\
- .join(CohortWikiUser)\
- .filter(CohortWikiUser.cohort_id == cohort_id)\
- .all()
- if len(user_ids) == 0:
- user_ids = db_session.query(WikiUser.mediawiki_userid).all()
-
- db_session.close()
-
- job = MetricJob(RandomMetric(), user_ids, 'enwiki')
- #from nose.tools import set_trace; set_trace()
- res = job.task.delay().get()
- print user_ids
- return str(res)
-
- @app.route('/demo/create/cohorts/')
- def add_demo_cohorts():
- db_sess = db.get_session()
+ def delete_my_cohorts(db_sess):
user = db_sess.query(User).filter_by(email=current_user.email).one()
# delete all of this user's data
@@ -65,6 +45,36 @@
db_sess.delete(r)
db_sess.commit()
+ return user
+
+ @app.route('/demo/metric/random/<int:cohort_id>')
+ def run_task_in_celery(cohort_id):
+ db_session = db.get_session()
+ user_ids = db_session.query(WikiUser.mediawiki_userid)\
+ .join(CohortWikiUser)\
+ .filter(CohortWikiUser.cohort_id == cohort_id)\
+ .all()
+ if len(user_ids) == 0:
+ user_ids = db_session.query(WikiUser.mediawiki_userid).all()
+
+ db_session.close()
+
+ job = MetricJob(RandomMetric(), user_ids, 'enwiki')
+ #from nose.tools import set_trace; set_trace()
+ res = job.task.delay().get()
+ print user_ids
+ return str(res)
+
+ @app.route('/demo/delete/cohorts/')
+ def demo_delete_cohorts():
+ db_sess = db.get_session()
+ delete_my_cohorts(db_sess)
+ db_sess.close()
+
+ @app.route('/demo/create/cohorts/')
+ def demo_add_cohorts():
+ db_sess = db.get_session()
+ user = delete_my_cohorts(db_sess)
# add cohorts and assign ownership to the passed-in user
cohort1 = Cohort(name='Algeria Summer Teahouse', description='',
enabled=True)
@@ -200,4 +210,5 @@
db_sess.add(CohortWikiUser(wiki_user_id=wu35.id,
cohort_id=cohort11.id))
db_sess.commit()
+ db_sess.close()
return 'OK, wiped out the database and added cohorts only for ' +
current_user.email
--
To view, visit https://gerrit.wikimedia.org/r/74165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7ce83c4bacb6da6354082ee47a09de6751f4bfa
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
