Skip to content

Sharing portals changes #1777

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.

Sign up for GitHub

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 2 commits into from
Apr 11, 2016
Merged

Sharing portals changes #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cae18f
change portal config
squirrelo Apr 11, 2016
1c64740
move import back
squirrelo Apr 11, 2016
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
3 changes: 2 additions & 1 deletion qiita_pet/handlers/analysis_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,8 @@ def _share(self, analysis, user, callback):
user = User(user)
add_message('Analysis <a href="%s/analysis/results/%d">\'%s\'</a> '
'has been shared with you.' %
(qiita_config.portal, analysis.id, analysis.name), [user])
(qiita_config.portal_dir, analysis.id, analysis.name),
[user])
callback(analysis.share(user))

@execute_as_transaction
Expand Down
2 changes: 1 addition & 1 deletion qiita_pet/handlers/study_handlers/listing_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def _share(self, study, user, callback):
user = User(user)
add_message('Study <a href="%s/study/description/%d">\'%s\'</a> '
'has been shared with you.' %
(qiita_config.portal, study.id, study.title), [user])
(qiita_config.portal_dir, study.id, study.title), [user])
callback(study.share(user))

@execute_as_transaction
Expand Down
2 changes: 2 additions & 0 deletions qiita_pet/templates/analysis_results.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
{%end%}

{%block content%}
{# LEAVE THIS IMPORT HERE OTHERWISE IT BREAKS #}
{% from future.utils import viewitems %}
<div class="row">
<table border="0">
<tr>
Expand Down