Skip to content

Transfer update delete templates #2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
9481d42
Moving update_sample_template
josenavas Aug 31, 2017
998197e
Transfer update_sample_template
josenavas Sep 1, 2017
656ac7f
Porting update prep template
josenavas Sep 5, 2017
37a5a74
Moving delete sample or column
josenavas Sep 5, 2017
4a6b3b2
Removing tests
josenavas Sep 5, 2017
0aaa53f
Solving merge conflicts
josenavas Sep 5, 2017
6f52ebd
Removing dispatchable and its tests
josenavas Sep 5, 2017
c2e7d8b
Updating interface to use the new functionality'
josenavas Sep 5, 2017
c450079
Adapting the prep template GUI
josenavas Sep 5, 2017
22ce457
Submitting jobs
josenavas Sep 6, 2017
d2259b0
Fixing tests
josenavas Sep 6, 2017
6ec24d9
Removing qiita_ware/context.py
josenavas Sep 6, 2017
e9901ed
flake8ing
josenavas Sep 6, 2017
2019e71
Fixing _system_call
josenavas Sep 7, 2017
830312d
Safeguarding the call to rollback
josenavas Sep 7, 2017
3f4cdcd
Unmasking more errors
josenavas Sep 7, 2017
d9d51e6
Forcing different connections on different processes
josenavas Sep 7, 2017
4339eda
Moving job completion to internal plugin structure
josenavas Sep 7, 2017
fa391d0
Removing unused code
josenavas Sep 7, 2017
dd74e11
Forcing the creation of a new transaction on the jobs
josenavas Sep 7, 2017
407fd8b
Fixing tests
josenavas Sep 7, 2017
966eb0f
forcing the commit
josenavas Sep 7, 2017
1a4026c
Fixing all tests
josenavas Sep 7, 2017
dc960a3
Addressing @antgonza's comments
josenavas Sep 8, 2017
63519f6
Addressing @antgonza's comment
josenavas Sep 8, 2017
eb2d314
Addressing @ElDeveloper's comments
josenavas Sep 8, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Submitting jobs
  • Loading branch information
josenavas committed Sep 6, 2017
commit 22ce457c7388b111001e543cdaea6ba32e720e95
2 changes: 2 additions & 0 deletions qiita_pet/handlers/api_proxy/prep_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ def prep_template_patch_req(user_id, req_op, req_path, req_value=None,

r_client.set(PREP_TEMPLATE_KEY_FORMAT % prep_id,
dumps({'job_id': job.id}))
job.submit()
else:
# We don't understand the attribute so return an error
return {'status': 'error',
Expand Down Expand Up @@ -473,6 +474,7 @@ def prep_template_patch_req(user_id, req_op, req_path, req_value=None,
# Store the job id attaching it to the sample template id
r_client.set(PREP_TEMPLATE_KEY_FORMAT % prep_id,
dumps({'job_id': job.id}))
job.submit()
return {'status': 'success', 'message': '', 'row_id': row_id}
else:
return {'status': 'error',
Expand Down
6 changes: 6 additions & 0 deletions qiita_pet/handlers/api_proxy/sample_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,8 @@ def sample_template_put_req(study_id, user_id, sample_template):
r_client.set(SAMPLE_TEMPLATE_KEY_FORMAT % study_id,
dumps({'job_id': job.id}))

job.submit()

return {'status': status,
'message': msg,
'file': sample_template}
Expand Down Expand Up @@ -441,6 +443,8 @@ def sample_template_delete_req(study_id, user_id):
r_client.set(SAMPLE_TEMPLATE_KEY_FORMAT % study_id,
dumps({'job_id': job.id}))

job.submit()

return {'status': 'success', 'message': ''}


Expand Down Expand Up @@ -543,6 +547,8 @@ def sample_template_patch_request(user_id, req_op, req_path, req_value=None,
r_client.set(SAMPLE_TEMPLATE_KEY_FORMAT % st_id,
dumps({'job_id': job.id}))

job.submit()

return {'status': 'success', 'message': '', 'row_id': row_id}

else:
Expand Down