From 93350a552cf76a47af8dbc3749c7d00a5c789569 Mon Sep 17 00:00:00 2001 From: Shreyas Satish Date: Mon, 16 Apr 2018 22:33:58 +0530 Subject: [PATCH] Revert "added time check for alert sending. cleanup. set sitemap" This reverts commit 661d6c78f2c3575a8f3000d7b2843734c8a79ede. --- hasjob/jobs/job_alerts.py | 3 --- hasjob/views/admin_filterset.py | 2 +- hasjob/views/job_alerts.py | 16 ++++++++-------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/hasjob/jobs/job_alerts.py b/hasjob/jobs/job_alerts.py index d6fa991d2..c76fcf90d 100644 --- a/hasjob/jobs/job_alerts.py +++ b/hasjob/jobs/job_alerts.py @@ -24,9 +24,6 @@ def send_email_alerts(): # Alert was sent recently, break out of loop break - if not subscription.is_right_time_to_send_alert(): - break - unseen_posts = get_unseen_posts(subscription) if not unseen_posts: # Nothing new to see, break out of loop diff --git a/hasjob/views/admin_filterset.py b/hasjob/views/admin_filterset.py index 7fb669e3f..242d8033a 100644 --- a/hasjob/views/admin_filterset.py +++ b/hasjob/views/admin_filterset.py @@ -26,7 +26,7 @@ def new(self): form = FiltersetForm(parent=g.board) if form.validate_on_submit(): - filterset = Filterset(board=g.board, title=form.title.data, sitemap=True) + filterset = Filterset(board=g.board, title=form.title.data) form.populate_obj(filterset) try: db.session.add(filterset) diff --git a/hasjob/views/job_alerts.py b/hasjob/views/job_alerts.py index 154014f67..f0e1f109a 100644 --- a/hasjob/views/job_alerts.py +++ b/hasjob/views/job_alerts.py @@ -65,12 +65,12 @@ def subscribe_to_job_alerts(): @app.route('/confirm_subscription_to_job_alerts', subdomain='') @app.route('/confirm_subscription_to_job_alerts') def confirm_subscription_to_job_alerts(): - subscription = JobPostSubscription.query.filter_by(email_verify_key=request.args.get('token')).one_or_none() - if not subscription: + sub = JobPostSubscription.query.filter_by(email_verify_key=request.args.get('token')).one_or_none() + if not sub: abort(404) - if subscription.email_verified_at: + if sub.email_verified_at: abort(400) - subscription.verify_email() + sub.verify_email() db.session.commit() flash(_(u"You've just subscribed to receive alerts from us! We'll keep you posted."), 'success') return redirect(url_for('index'), code=302) @@ -79,12 +79,12 @@ def confirm_subscription_to_job_alerts(): @app.route('/unsubscribe_from_job_alerts', subdomain='') @app.route('/unsubscribe_from_job_alerts') def unsubscribe_from_job_alerts(): - subscription = JobPostSubscription.query.filter_by(unsubscribe_key=request.args.get('token')).one_or_none() - if not subscription: + sub = JobPostSubscription.query.filter_by(unsubscribe_key=request.args.get('token')).one_or_none() + if not sub: abort(404) - if not subscription.email_verified_at: + if not sub.email_verified_at: abort(400) - subscription.unsubscribe() + sub.unsubscribe() db.session.commit() flash(_(u"You've just unsubscribed from receiving alerts! Hope they were useful."), 'success') return redirect(url_for('index'), code=302)