Skip to content

Commit 803299f

Browse files
committed
addressing @josenavas comments
1 parent 2d4c258 commit 803299f

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

qiita_pet/handlers/study_handlers/description_handlers.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
QiitaDBDuplicateHeaderError, QiitaDBError)
3030
from qiita_pet.handlers.base_handlers import BaseHandler
3131
from qiita_pet.handlers.util import check_access
32+
from qiita_pet.handlers.study_handlers.listing_handlers import (
33+
ListStudiesHandler)
3234

3335
html_error_message = "<b>An error occurred %s %s</b></br>%s"
3436

@@ -654,10 +656,18 @@ def delete_study(self, study, user, callback):
654656
is done and it fails
655657
"""
656658
study_id = study.id
659+
study_title = study.title
657660

658661
try:
659662
Study.delete(study_id)
660-
self.redirect('/study/list/')
663+
664+
# redirecting to list but also passing messages
665+
# we need to change the request.method to GET
666+
self.request.method = 'GET'
667+
ListStudiesHandler(self.application, self.request)._execute(
668+
[t(self.request) for t in self.application.transforms],
669+
message=('Study "%s" has been deleted' % study_title),
670+
msg_level='success')
661671
except Exception as e:
662672
msg = "Couldn't remove study %d: %s" % (study_id, str(e))
663673
msg_level = "danger"

qiita_pet/handlers/study_handlers/listing_handlers.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,16 @@ def _check_owner(user, study):
123123
class ListStudiesHandler(BaseHandler):
124124
@authenticated
125125
@coroutine
126-
def get(self):
126+
def get(self, message="", msg_level=None):
127127
all_emails_except_current = yield Task(self._get_all_emails)
128128
all_emails_except_current.remove(self.current_user.id)
129129
avail_meta = SampleTemplate.metadata_headers() +\
130130
get_table_cols("study")
131-
self.render('list_studies.html', availmeta=avail_meta,
132-
all_emails_except_current=all_emails_except_current)
131+
self.render('list_studies.html',
132+
availmeta=avail_meta,
133+
all_emails_except_current=all_emails_except_current,
134+
message=message,
135+
msg_level=msg_level)
133136

134137
def _get_all_emails(self, callback):
135138
callback(list(User.iter()))

0 commit comments

Comments
 (0)