Merge pull request #1776 from squirrelo/sharing-portals-changes

Fix redundant URLs

Author: antgonza

qiita_pet/handlers/analysis_handlers.py

@@ -372,9 +372,9 @@ def _get_shared_for_study(self, analysis, callback):
     @execute_as_transaction
     def _share(self, analysis, user, callback):
         user = User(user)
-        add_message('Analysis <a href="/analysis/results/%d">\'%s\'</a> '
+        add_message('Analysis <a href="%s/analysis/results/%d">\'%s\'</a> '
                     'has been shared with you.' %
-                    (analysis.id, analysis.name), [user])
+                    (qiita_config.portal, analysis.id, analysis.name), [user])
         callback(analysis.share(user))
 
     @execute_as_transaction

qiita_pet/handlers/study_handlers/listing_handlers.py

@@ -26,6 +26,7 @@
 from qiita_db.util import get_pubmed_ids_from_dois, add_message
 from qiita_core.exceptions import IncompetentQiitaDeveloperError
 from qiita_core.util import execute_as_transaction
+from qiita_core.qiita_settings import qiita_config
 from qiita_pet.handlers.base_handlers import BaseHandler
 from qiita_pet.handlers.util import (
     study_person_linkifier, doi_linkifier, pubmed_linkifier, check_access,
@@ -250,9 +251,9 @@ def _get_shared_for_study(self, study, callback):
     @execute_as_transaction
     def _share(self, study, user, callback):
         user = User(user)
-        add_message('Study <a href="/study/description/%d">\'%s\'</a> '
+        add_message('Study <a href="%s/study/description/%d">\'%s\'</a> '
                     'has been shared with you.' %
-                    (study.id, study.title), [user])
+                    (qiita_config.portal, study.id, study.title), [user])
         callback(study.share(user))
 
     @execute_as_transaction

qiita_pet/templates/analysis_results.html

@@ -9,7 +9,7 @@
 <script type="text/javascript">
 $(document).ready(function () {
   init_sharing("{% raw qiita_config.portal_dir %}");
-  update_share("{% raw qiita_config.portal_dir %}/analysis/sharing/");
+  update_share();
 });
 </script>
 {%end%}

qiita_pet/templates/study_ajax/base_info.html

@@ -6,7 +6,7 @@
 <script type="text/javascript">
 $(document).ready(function () {
   init_sharing("{% raw qiita_config.portal_dir %}");
-  update_share('{% raw qiita_config.portal_dir %}/study/sharing/');
+  update_share();
 });
 </script>
 <p style="font-weight:bold;">Abstract</p>